Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:43:53 +0000 (10:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:43:53 +0000 (10:43 +0200)
commitd891de4a6df49bf2b1162dbc70a1c648e6db5d58
tree7e3f521ef8a6650e0ad2005a8b9bf26aecff14e9
parent0bc6305c1114909f671f17cb8f9f9107339d33d4
parent4b5cc864a8ec1f16b95c562481e6b46812201bdd
Merge branch '2013.10' into 2014.09

Conflicts:
tine20/Admin/Frontend/Cli.php
tine20/Tinebase/Translation.php
tine20/Tinebase/User/Abstract.php

Change-Id: I75ecd3929ef7b6780624cb3dfe86161ffd649f93
tests/tine20/Courses/JsonTest.php
tests/tine20/Inventory/Import/CsvTest.php
tine20/Admin/Frontend/Cli.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Inventory/Model/InventoryItem.php
tine20/Inventory/Setup/Initialize.php
tine20/Tinebase/Controller.php
tine20/Tinebase/Translation.php
tine20/Tinebase/User/Abstract.php