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)
1  2 
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/User.php
tine20/Tinebase/User/Ldap.php

Simple merge
Simple merge