Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Aug 2013 08:48:11 +0000 (10:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Aug 2013 08:48:11 +0000 (10:48 +0200)
commite76b4ae80196bc799f0b6de3c69b3b915419b624
tree8a025116318e674dac26b4b3afffd7fefee0b20a
parent0b05db6c7593eb3f6e5071a81f9cd4637163b93b
parent0d09575a57f12994f5a7a1d98eb5b5afa79f8f03
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Felamimail/Controller/Message/Send.php