Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:42 +0000 (17:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:42 +0000 (17:48 +0200)
commit9057c0fb6ae3f104790d6689c4b52ffac7a953b9
tree048b3d1aa2a2afe90fd109e23f72c2bcdaed6dd0
parent595e8ab9b5bf39ae1eac4dc9041ba0a49a8028f5
parent6d74dcd1192f094c72a208fff749e220cd862acf
Merge branch '2013.10' into 2014.11
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/User.php
tine20/Tinebase/User/Ldap.php