Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-06-21 00:17:25 +00:00 committed by Gerrit Code Review
commit 6e4823c07c

@ -3,7 +3,7 @@ hacking>=0.9.2,<0.10
coverage>=3.6
discover
fixtures>=0.3.14
httpretty>=0.8.0
httpretty>=0.8.0,!=0.8.1,!=0.8.2
keyring>=2.1
mock>=1.0
sphinx>=1.1.2,!=1.2.0,<1.3