Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Sep 2013 10:00:26 +0000 (12:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Sep 2013 10:00:26 +0000 (12:00 +0200)
Conflicts:
scripts/packaging/debian/changelog
tine20/library/Syncroton/.gitignore
tine20/library/Syncroton/composer.json
tine20/library/Syncroton/docs/syncroton.sql
tine20/library/Syncroton/lib/Syncroton/Command/Ping.php
tine20/library/Syncroton/lib/Syncroton/Command/Sync.php
tine20/library/Syncroton/lib/Syncroton/Model/IDevice.php
tine20/library/Syncroton/lib/Syncroton/Server.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Abstract.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Decoder.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Dtd/ActiveSync/CodePage0.php
tine20/library/Syncroton/lib/Syncroton/Wbxml/Encoder.php
tine20/library/Syncroton/tests/Syncroton/ServerTests.php
tine20/library/Syncroton/tests/bootstrap.php
tine20/library/Syncroton/tests/phpunit.xml

1  2 
scripts/packaging/debian/changelog

@@@ -1,8 -1,8 +1,14 @@@
- tine20 (2013.10.0~beta1-0) natty; urgency=low
++tine20 (2013.10.1~beta1-0) natty; urgency=low
 +
 +  * New upstream release "Collin" Beta 1
 +
-  -- Philipp Schüle <p.schuele@metaways.de>  Thu, 17 Sep 2013 13:41:22 +0200
++ -- Philipp Schüle <p.schuele@metaways.de>  Thu, 26 Sep 2013 13:41:22 +0200
++
+ tine20 (2013.03.8-0) natty; urgency=low
+   * New upstream release "Kristina" Service Release 7
+  -- Philipp Schüle <p.schuele@metaways.de>  Thu, 19 Sep 2013 10:09:23 +0200
  
  tine20 (2013.03.7-0) natty; urgency=low