Merge remote-tracking branch 'upstream/master' into python-registry-v2

2015-11-11 16:41:40 -05:00 · 2015-11-11 16:41:40 -05:00 · ab340e20ea
commit ab340e20ea
parent 1d7be74a1f a1ccd860e7
43 changed files with 862 additions and 248 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -4,6 +4,7 @@ APScheduler==3.0.3
 autobahn==0.9.3-3
 Babel==1.3
 beautifulsoup4==4.4.0
+bintrees==2.0.2
 blinker==1.3
 boto==2.38.0
 cachetools==1.0.3