Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 May 2013 07:32:35 +0000 (09:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 31 May 2013 07:32:35 +0000 (09:32 +0200)
commit3b94479f9ae19494ef3bfebc9dd2ddf677c39271
tree9e20754613535eda012562ec544651a61451befb
parentaa6f330567499d374d60855c28f171d18c499782
parent295d5494206ab7f394a3434c62d91aa3d8dfa267
Merge branch '2013.03'

Conflicts:
tine20/Phone/Frontend/Json.php
tests/tine20/Phone/JsonTest.php
tine20/Phone/Controller/MyPhone.php
tine20/Phone/Frontend/Json.php