Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 May 2015 12:57:13 +0000 (14:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 May 2015 12:57:13 +0000 (14:57 +0200)
commita8aed33fa4c795ad1fd527faa9f20f8b13daa002
tree6acd8e553ea805ae1be84e12d26b45ec2fdfc291
parente4b47df41acf2193d2413e508896bf825d79ac6f
parente921c82d18da091067516e75e07b6768c01fb606
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Setup/js/AuthenticationPanel.js

Change-Id: Ib7d66926b11cfb6a12405dc2dbbb1b708d76e026
tine20/Setup/js/AuthenticationPanel.js