Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Fri, 7 Feb 2014 19:15:52 +0000 (20:15 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 7 Feb 2014 19:15:52 +0000 (20:15 +0100)
commit043d80193e507202d3e1b9456ed802940f2611d7
treea833993818b97b3c7689ee3e7e2771fb5600889f
parent37c61d76869a50110e298b042660eb5120a282c8
parent9f2df510b17f6b64801677915f5c25f73290d3f4
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
configure.ac
debian/changelog
configure.ac
debian/changelog