Merge "Fixed parse error, finished renaming s/syncope/syncroton/, removed some spaces...
authorLars Kneschke <l.kneschke@metaways.de>
Thu, 26 Jul 2012 13:31:21 +0000 (15:31 +0200)
committerGerrit Code Review <syncroton@tine20-git.metaways.net>
Thu, 26 Jul 2012 13:31:21 +0000 (15:31 +0200)

Trivial merge