From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 28 Mar 2011 21:16:24 +0000 (-0400)
Subject: Merge branch 'julian' of git://github.com/lapilofu/philo
X-Git-Tag: philo-0.9~16^2~6
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e14041301b4d914127920f50e47a9ae8c990af4e

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

e14041301b4d914127920f50e47a9ae8c990af4e