Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Feb 2016 14:13:43 +0000 (15:13 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Feb 2016 14:13:43 +0000 (15:13 +0100)
commit46c73243abd5d6408450a7b4e019ad6295a2028b
tree5ff8cedd99265024d27ac57b317e378fb09412c1
parent0b1f0ff94a2256fe44d448407a6afa501b4a0d11
parent0af7347e07cbc7f8d12922a19e222f01473d3aeb
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Tinebase/js/AppManager.js

Change-Id: If5701f14e8ac23ef81835bcb744ffe4fee119857
tine20/Tinebase/js/AppManager.js