From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 26 May 2011 16:27:45 +0000 (-0400)
Subject: Merge remote branch 'ithinksw/master' into release
X-Git-Tag: philo-0.9~8^2~7
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/853b15703adfe5313ca3c51bd108327ded538ae2

Merge remote branch 'ithinksw/master' into release
---

853b15703adfe5313ca3c51bd108327ded538ae2