Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Aug 2013 15:30:12 +0000 (17:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Aug 2013 15:30:12 +0000 (17:30 +0200)
Conflicts:
tine20/Felamimail/Controller/Message/Send.php


Trivial merge