From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Sat, 27 Aug 2011 23:04:50 +0000 (-0700)
Subject: Merge branch 'taggit' into develop
X-Git-Tag: philo-0.9.1^2~3^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/cbbff4f681be1a7a1666424d7c2883dfd4a7c30d?hp=cbbff4f681be1a7a1666424d7c2883dfd4a7c30d

Merge branch 'taggit' into develop

Conflicts:
	philo/admin/widgets.py
	philo/contrib/penfield/admin.py
---