Matthew Tretter cef3a41d86 Merge branch 'ik-next' into cacheables ... Conflicts: imagekit/management/commands/warmimagecache.py imagekit/registry.py		2013-01-28 21:45:37 -05:00
..
__init__.py	Change spec/source registry to generator/cacheable	2013-01-23 22:46:57 -05:00
files.py	Fix imagekit.models.fields.ProcessedImageField	2013-01-23 22:41:23 -05:00
utils.py	Specs no longer accept arbitrary kwargs	2013-01-23 21:35:38 -05:00