Merge branch 'master' of github.com:python-imaging/Pillow

This commit is contained in:
Alex Clark 2013-03-13 22:09:48 -04:00
commit aa90543c32

View File

@ -1,5 +1,5 @@
import Image
import ImageFile
from PIL import Image
from PIL import ImageFile
import StringIO
import _webp