Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/python-cdb
authorMark Wooding <mdw@distorted.org.uk>
Mon, 6 May 2013 09:10:33 +0000 (10:10 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 6 May 2013 09:10:33 +0000 (10:10 +0100)
commite8e2d0b9c3e02acb4ef3d925bbce98d551598b87
treef41f89dd5bebb13dc6b3420b32226e58f7790966
parentb69e008ac99f551ac07797fab1334c61dab17494
parent951f23e51e916a13f53fcd461d2ac8f931216058
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/python-cdb

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/python-cdb:
  debian/gbp.conf: Configuration for `git-buildpackage' and friends.