Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Jan 2015 17:25:16 +0000 (18:25 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Jan 2015 17:25:16 +0000 (18:25 +0100)
1  2 
tine20/Admin/Controller/User.php
tine20/Tinebase/User.php

Simple merge
Simple merge