Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master 1.0.1ubuntu1
authorMichael Vogt <mvo@debian.org>
Thu, 10 Apr 2014 08:37:03 +0000 (10:37 +0200)
committerMichael Vogt <mvo@debian.org>
Thu, 10 Apr 2014 08:37:03 +0000 (10:37 +0200)
commitb3f695d42baa95139e8172e97b0f4ab38550b7b5
tree0aa1bc53b760b1c33acf662ea8614e128ccb34d0
parenta1a253e8be978998b66af62240a25864db2cc694
parent128aa7d3630f138f37ef83e3e8564feca01ec429
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master

Conflicts:
debian/changelog
debian/changelog