Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Oct 2014 12:47:02 +0000 (13:47 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Oct 2014 12:47:02 +0000 (13:47 +0100)
commit1024d5b7d7583adb4e3d38ff329e4f1c05f4ecf6
tree7686cf5ce71422c8ddb11dd191b58c655bd8845e
parentaa840d9eb5e37d234e395a404db042ee4f1ecafd
parente2e65c2f38d537c1c849bdb499dd831cf95bf24d
Merge branch '2013.10' into 2014.09

Conflicts:
tine20/Sales/css/Sales.css

Change-Id: Ib918aed81b96952178b78126b066689665b9892c
tests/tine20/Calendar/Controller/EventTests.php
tine20/Calendar/js/Model.js
tine20/Crm/Controller/Lead.php
tine20/Sales/css/Sales.css