Merge branch 'pu/2013.03/logger'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:38:42 +0000 (18:38 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:38:42 +0000 (18:38 +0200)
Conflicts:
tine20/Tinebase/Core.php
tine20/Tinebase/Log.php

1  2 
tine20/Tinebase/Core.php

Simple merge