From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Fri, 3 Jun 2011 16:37:50 +0000 (-0400)
Subject: Merge branch 'release' into develop
X-Git-Tag: philo-0.9.1^2~8^2~7
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/093ad8d3312e2ba27730f8f5c915ca113ce72041?ds=sidebyside;hp=-c

Merge branch 'release' into develop
---

093ad8d3312e2ba27730f8f5c915ca113ce72041