From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 9 Feb 2011 15:30:58 +0000 (-0500)
Subject: Merge branch 'master' into julian
X-Git-Tag: philo-0.9~15^2~3^2~13
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/7ef5d942e4e1f7de42a389c196de3a13b31e8d45

Merge branch 'master' into julian
---

7ef5d942e4e1f7de42a389c196de3a13b31e8d45