From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Sun, 10 Jul 2011 19:27:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'ithinksw/develop' into develop
X-Git-Tag: philo-0.9.1^2~3^2~6
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/d0dbd3635a4c1d1c47040fd17f5a8d2bec08a7e9

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

d0dbd3635a4c1d1c47040fd17f5a8d2bec08a7e9