Merge branch '1.11' into 1.12

2014-03-05 09:55:19 -08:00 · 2014-03-05 09:55:19 -08:00 · feb78d8a3f
parent 38785d9cd2 48ab72508a
commit feb78d8a3f
1 changed files with 0 additions and 1 deletions
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -1,6 +1,5 @@
 # Older junk
 tox>=1.4,<1.5
-epydoc>=3.0,<3.1
 # For newer tasks like building Sphinx docs.
 # NOTE: Requires Python >=2.6
 invoke>=0.7.0