Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Oct 2013 10:21:15 +0000 (12:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Oct 2013 10:21:15 +0000 (12:21 +0200)
commit5fa4a56cc2a2cf83c3226c1d69ddd46d6b35f630
tree47c0237948aceac7d1a68deaa08cc2192f45ebcc
parent0f8e3cc1dde53fc0f5ba22729a7c0592b395d38f
parent0687bf3d894431db4b3ba4fbcbdbdeab516664b2
Merge branch '2013.03'
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/User/Abstract.php
tine20/Tinebase/User/Sql.php