From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 23 Jun 2011 16:36:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'ithinksw/develop' into develop
X-Git-Tag: philo-0.9.1^2~7^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/15dc5dbd1bbfa147a1ec88f6c121edbc4f39faaf?ds=inline

Merge remote-tracking branch 'ithinksw/develop' into develop
---

15dc5dbd1bbfa147a1ec88f6c121edbc4f39faaf