Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Jan 2015 15:02:07 +0000 (16:02 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Jan 2015 15:02:07 +0000 (16:02 +0100)
commitec0acaae721311ee418c63e44cdac952ce8c45af
treed6f70a239ea7502d7e59d24c5ebfc6849101d1cf
parentd2c1de13bbfe9987e14764b6b313976a1e1ff460
parent53f430ded62211009da6fec7c7ccccf164a069a9
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Felamimail/Frontend/ActiveSync.php

Change-Id: I327dee422c5248195af380ac9130091c16daf094
tine20/Calendar/js/EventUI.js
tine20/Felamimail/Frontend/ActiveSync.php