From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 11 Jul 2011 15:26:41 +0000 (-0400)
Subject: Merge branch 'hotfix/oberlin_references' into taggit
X-Git-Tag: philo-0.9.1^2~3^2^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/5629695bf0cb97b135eb076caf92e0382b2d8290

Merge branch 'hotfix/oberlin_references' into taggit
---

5629695bf0cb97b135eb076caf92e0382b2d8290