Merge branch 'master' into diana/open-ended-tests

This commit is contained in:
Diana Huang
2012-12-11 09:53:05 -05:00

View File

@@ -55,3 +55,4 @@ dogstatsd-python
# MySQL-python
sphinx
Shapely
ipython