Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:14:08 +0000 (08:14 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:14:08 +0000 (08:14 +0200)
commit6074bc9ba4ecdd08674a828bdb46323b5d8bf957
tree72d925cd1347207a5d855d12d11786a27441dbd9
parent7f3fa3f5a84a53114b88806dc721cf293063ac68
parenteb197ed71b1535f3c1715c8a751485ef927b51b7
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid