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

Merge branch 'master' into docs
---

ba4bab73996c40c2551f7e5a0e478d0f553b8af3