Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Tue, 1 Apr 2014 15:49:06 +0000 (17:49 +0200)
committerMichael Vogt <mvo@debian.org>
Tue, 1 Apr 2014 15:49:06 +0000 (17:49 +0200)
commit4c3722e3a74f183b331b0a782017ae442ca143fb
tree683cb69a004aedcf38151aadf0a30c5261ffe83e
parentd13bb95849fd168200554972b4295c40933e2461
parent5cfd6ef6c6ad67658c042453075e54ac23d10245
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
debian/changelog
debian/changelog