Merge branch 'debian' into wheezy debian/13.11.1_bpo60+1
authorBdale Garbee <bdale@gag.com>
Sun, 10 Nov 2013 18:48:17 +0000 (10:48 -0800)
committerBdale Garbee <bdale@gag.com>
Sun, 10 Nov 2013 18:48:17 +0000 (10:48 -0800)
commit8a6066ffd8700311219e42ad7038f823abe4d184
tree22d95fe7c6dc9c9d4aff2832ab08ed845fb3b5fe
parentdd8f3485a8bbd5a3a915feae3bb65eca9a2da46f
parentf222654c333715841e7707fe956ca2998b83a265
Merge branch 'debian' into wheezy

Conflicts:
debian/changelog
debian/changelog
debian/gbp.conf