[tor-commits] [bridgedb/develop] Merge branch 'hotfix/0.3.2-pep440' into develop

[isis at torproject.org]

commit 300bc1110c686285080d4e5e162d7fdcc9dc6480
Merge: 8bf4f5f 6fb22aa
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Jun 25 06:43:43 2015 +0000

    Merge branch 'hotfix/0.3.2-pep440' into develop

 MANIFEST.in          |    2 +
 bridgedb/_version.py |  551 ++++++++++----
 setup.cfg            |   21 +
 setup.py             |   18 -
 versioneer.py        | 2045 +++++++++++++++++++++++++++++++++++++-------------
 5 files changed, 1974 insertions(+), 663 deletions(-)