Merge branch 'master' of http://git.syncroton.org/Syncroton
authorCornelius Weiß <mail@corneliusweiss.de>
Mon, 13 Aug 2012 09:29:13 +0000 (11:29 +0200)
committerCornelius Weiß <mail@corneliusweiss.de>
Mon, 13 Aug 2012 09:29:13 +0000 (11:29 +0200)
commitb7543c10f803a1b4c77da2df7c8b3f0bc69984f8
tree42701390578f8c81cdb8b64ac5280b7a0ed15143
parent93b74025402270c0706eeb40084ec8b80f8ecb01
parentfd67b9fb5abd50f3c7370a07e32e0c05ad8d04a9
Merge branch 'master' of git.syncroton.org/Syncroton