From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 1 Jun 2011 21:50:47 +0000 (-0400)
Subject: Merge branch 'release' into develop
X-Git-Tag: philo-0.9.1^2~8^2~9
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/ac54db264df3ba87306945a5494bd89e38266c38

Merge branch 'release' into develop
---

ac54db264df3ba87306945a5494bd89e38266c38