Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:32:59 +0000 (08:32 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 06:32:59 +0000 (08:32 +0200)
commit9eaa24c169b547d6c6a4815bb19eabcbec243317
tree8356aa93d071101ad0c2e6f3e3d937006a068e69
parent6074bc9ba4ecdd08674a828bdb46323b5d8bf957
parent24d05892fe96d52aaceef7af94d0e444e140067c
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid