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

2014-04-30 Thread isis
commit b758227593ad3e0c0893326d5917de87629997ae Merge: 10dd852 4c81926 Author: Isis Lovecruft Date: Thu May 1 00:33:39 2014 + Merge branch 'hotfix/requirements-travis' .travis.yml |7 ++- Makefile |6 +- lib/bridgedb/util.py | 42

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

2014-04-30 Thread isis
commit 238b1536dbcf0e4344f097e62aa574a64844fa73 Merge: 530f2b3 4c81926 Author: Isis Lovecruft Date: Thu May 1 00:34:09 2014 + Merge branch 'hotfix/requirements-travis' into develop .travis.yml |7 ++- Makefile |6 +- lib/bridgedb/util.py | 40 +++