[tor-commits] [bridgedb/master] Merge branch 'hotfix/requirements-travis'

[isis at torproject.org]

commit b758227593ad3e0c0893326d5917de87629997ae
Merge: 10dd852 4c81926
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu May 1 00:33:39 2014 +0000

    Merge branch 'hotfix/requirements-travis'

 .travis.yml          |    7 ++-----
 Makefile             |    6 +++++-
 lib/bridgedb/util.py |   42 +++++++++++++++++++++++++-----------------
 requirements.txt     |    3 ---
 4 files changed, 32 insertions(+), 26 deletions(-)