From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 31 Mar 2011 18:27:44 +0000 (-0400)
Subject: Merge branch 'master' into gilbert
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/f69e27528218f5db3e4fafd536be49f473e3b8fd

Merge branch 'master' into gilbert

Conflicts:
	forms/entities.py
---

f69e27528218f5db3e4fafd536be49f473e3b8fd