From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 12 Apr 2011 20:25:06 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/lapilofu/philo
X-Git-Tag: philo-0.9~15^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b3e16b23802c9bc5a99193f9e9551b4378ee1119

Merge branch 'master' of git://github.com/lapilofu/philo
---

b3e16b23802c9bc5a99193f9e9551b4378ee1119