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)
commit0b05db6c7593eb3f6e5071a81f9cd4637163b93b
tree790d0325bc4a68e6ce4ee924b7ecd0dfa1e8c064
parent2a7dd66f15abd668b3e7e6fada3be5f98c508dc2
parentaa0e987a0b8897843fd6504ede01cfe69ab9477f
Merge branch 'pu/2013.03/modelconfig-hr'

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