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

Merge branch 'shipherd_hotfix' into release
---

fb8a270fa22abc217efc471d860c76d5a2352c61