Merge branch 'pu/2013.10-longrun'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 11:17:20 +0000 (13:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 11:17:20 +0000 (13:17 +0200)
commite1b6a9443907795bd1ab2c57c84b5bf17e535af7
tree97f4b7ad50eb82854d54cd65413409023a9486c6
parent48b77a58ac36754e19089d31b0d986bbada51e20
parentdc200aff6ca563a3e1c6082d52bfda5559a3bb6c
Merge branch 'pu/2013.10-longrun'

Conflicts:
tests/tine20/Sales/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Sales/Controller/NumberableAbstract.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/WebDav/Root.php
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/composer.lock

Change-Id: I9105c48440ae5f0341528122abbfdc3b627cd2db
tests/tine20/Calendar/Backend/SqlTest.php
tests/tine20/Calendar/Controller/RecurTest.php
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Model/Rrule.php
tine20/Sales/Setup/Update/Release8.php
tine20/Tinebase/Backend/Sql/Command/Mysql.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/User.php
tine20/Tinebase/translations/template.pot