Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Jul 2013 15:33:39 +0000 (17:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Jul 2013 15:33:39 +0000 (17:33 +0200)
1  2 
tine20/Calendar/Model/Event.php
tine20/Calendar/js/Model.js

Simple merge
Simple merge