Merge branch '0.12'

cloudappsetup · Sep 18, 2011 · a5c1500 · a5c1500
2 parents d788ba8 + fac5e5e
commit a5c1500
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.hgignore → .gitignore b/.hgignore → .gitignore
@@ -1,7 +1,5 @@
-syntax: glob
 *.pyc
 _trial_temp
 dropin.cache
-.svn
 docs/build
 *egg-info