Merge branch 'master' into rewrite

2012-02-06 21:41:11 -05:00
parent 50ebdd7f2c 41e8546be6
commit 302e1d592a
51 changed files with 114 additions and 46 deletions
--- a/overviewer_core/googlemap.py
+++ b/overviewer_core/googlemap.py
@@ -17,7 +17,7 @@ import os
 import os.path
 import stat
 import cPickle
-import Image
+from PIL import Image
 import shutil
 from time import strftime, localtime
 import json