Merge branch 'sid' master
authorBen Hutchings <ben@decadent.org.uk>
Mon, 12 Dec 2016 19:56:30 +0000 (19:56 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 12 Dec 2016 19:56:30 +0000 (19:56 +0000)
commit52a7a44f95fab091becece32a6995a409fd59fd1
treed9bc2426ee23f338c66f5b23e8e5e594c8084b57
parent6d9a853c096f129de3cc22e74bc450dfa73e1d56
parent45e5820959ae49256747cae78f0d18d0ca61bb06
Merge branch 'sid'

Conflicts:
debian/changelog
debian/changelog