Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 11 Jun 2013 16:23:14 +0000 (18:23 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 11 Jun 2013 16:23:14 +0000 (18:23 +0200)
commitd39cf1c107b4a2ba719732d6f706a5cca269d1d7
treeb5885b7d5bc7db715c9220a5dbc4c49a59a5644b
parentc9f3f3a4692931891796d1ec0cf3bb7a0d8db982
parent493db7787fa0f7964b2b453a221ffd7444754a4a
Merge branch '2013.03'

Conflicts:
tine20/Calendar/js/AttendeeFilterGrid.js
tine20/Calendar/js/AttendeeFilterGrid.js
tine20/Calendar/js/AttendeeGridPanel.js