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	Merge branch 'ik-next' into cacheables	2013-01-28 21:45:37 -05:00
sourcegroups.py	Register cacheables as generators instead of items	2013-01-24 00:04:43 -05:00