Merge branch 'develop' of github.com:pypa/virtualenv into develop

Conflicts: MANIFEST.in
pypa · Jun 22, 2012 · 7525efb · 7525efb
2 parents d9187ac + a66a4aa
commit 7525efb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
+recursive-include bin *
 recursive-include docs *
 recursive-include scripts *
 recursive-include virtualenv_support *.egg *.tar.gz
@@ -7,4 +8,4 @@ recursive-exclude docs/_build *
 include virtualenv_support/__init__.py
 include *.py
 include AUTHORS.txt
-include LICENSE.txt
+include LICENSE.txt