Merge branch 'debian' into wheezy wheezy debian/14.06_bpo60+1
authorBdale Garbee <bdale@gag.com>
Thu, 26 Jun 2014 15:34:06 +0000 (09:34 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 26 Jun 2014 15:34:06 +0000 (09:34 -0600)
commit49f11f0dd1c4e1cef99a678bb8beb2e35735d458
tree9cacae528d447fc65aff1a2afdc6cc560cf36786
parent8a6066ffd8700311219e42ad7038f823abe4d184
parent3ae5c2831a3b5ce0a93173cabbbba02d2f0f9abb
Merge branch 'debian' into wheezy

Conflicts:
debian/changelog
debian/changelog
debian/control