From: Lars Kneschke Date: Thu, 21 Feb 2013 10:05:05 +0000 (+0100) Subject: Merge branch 'master' of http://git.syncroton.org/Syncroton into SyncrotnMerge X-Git-Tag: 2015.07.5~931^2~21 X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=080b50f3447060ba00a54c2a2d2d9939ee315f26 Merge branch 'master' of git.syncroton.org/Syncroton into SyncrotnMerge Conflicts: scripts/packaging/debian/control --- 080b50f3447060ba00a54c2a2d2d9939ee315f26