Merge branch 'pu/2013.10-userdeactivation'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:34 +0000 (20:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:34 +0000 (20:47 +0200)
commita7c5505e78fc5ce0ddc58387e28a6896364d3a6a
treeaff1cd288b0b1000ef5dee72f571582b842cb1ff
parentffe09baaac729c5874f1e480b8d040abb4cc1d34
parentda3dbf698a4b813027ebb9d6aa2da0bfd3fd0e06
Merge branch 'pu/2013.10-userdeactivation'

Conflicts:
tine20/Tinebase/Config.php

Change-Id: Icc3ff03d1c790fe33f57f5ef7b44b4384795b396
tine20/Tinebase/Config.php
tine20/Tinebase/Controller.php
tine20/Tinebase/User/Sql.php