Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:13:59 +0000 (18:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Mar 2015 17:13:59 +0000 (18:13 +0100)
commitdd70d57814aed4ad624de7d091cdde273c09c5e7
treebf5cc037ecd189ecc94af124f6afe1df9b5c72a4
parente503e6cdfe27b398db12eb14c67c78a9281e0070
parent6f4d7557af4dc26341b0262f8bd2ed19a1697998
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Tinebase/js/widgets/ActivitiesPanel.js

Change-Id: I3103481911913fe8136965d56bd4d462bea571ab