From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 28 Apr 2011 20:13:55 +0000 (-0400)
Subject: Merge branch 'release' into gilbert
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/a2d75eae2cab588a28155b9c901935aa8d664d5f?hp=a2d75eae2cab588a28155b9c901935aa8d664d5f

Merge branch 'release' into gilbert

Conflicts:
	README
---