Eric Eldredge 2e5489eb56 Merge branch 'ik-next' into templatetags ... Conflicts: imagekit/models/fields/__init__.py imagekit/utils.py		2012-10-04 15:46:50 -04:00
..
fields	Add image cache strategies	2012-10-03 22:23:11 -04:00
__init__.py	Use django-appconf	2012-07-19 21:03:15 -04:00
receivers.py	Change how signals are used	2012-07-25 23:04:21 -04:00