Permalink
Browse files

Merge remote-tracking branch 'upstream/develop' into develop

  • Loading branch information...
2 parents dc00129 + fab6375 commit ee0da4fa4e5b27fbec8ad96d943ff8ae8808b653 @kurin kurin committed Feb 23, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitignore
View
@@ -11,6 +11,6 @@ MANIFEST
.tox
.coverage
*flymake.py
-
+venv
# for python 3 port
py3kport/build*

0 comments on commit ee0da4f

Please sign in to comment.