From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 21 Feb 2011 21:22:46 +0000 (-0500)
Subject: Merge branch 'master' into docs
X-Git-Tag: philo-0.9~12^2~32^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/7beaf5e7ce33721111cf455028dc872ff8a5512a

Merge branch 'master' into docs
---

7beaf5e7ce33721111cf455028dc872ff8a5512a