Merge branch 'feature/edit-sources' into debian/sid
authorMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 07:38:12 +0000 (08:38 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 07:38:12 +0000 (08:38 +0100)

Trivial merge