From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 4 May 2011 19:49:19 +0000 (-0400)
Subject: Merge branch 'shipherd_hotfix'
X-Git-Tag: philo-0.9~13^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/454e6844441dc1d4d624d89616bb9b21436f5fca

Merge branch 'shipherd_hotfix'
---

454e6844441dc1d4d624d89616bb9b21436f5fca