Merge branch 'pu/2014.11-splitview' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Apr 2015 10:13:14 +0000 (12:13 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Apr 2015 10:13:14 +0000 (12:13 +0200)
commit429d76ee444e25c0bb5207db572d9bf05e1c1b5c
tree80e61758ab8d5b22c48444bb53ffe0a75f695c90
parentc9094cea236a66e17cc4d2499c9b675d57c1615b
parent75320fd1c0165ea0be74995bbaba978c9c1ffb3a
Merge branch 'pu/2014.11-splitview' into 2014.11-develop

Conflicts:
tine20/Calendar/js/DaysView.js
tine20/Calendar/js/MainScreenCenterPanel.js

Change-Id: I2fd37fa9819a7a660c3fe48489139cb1f82e534c
tine20/Calendar/js/DaysView.js