From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 22 Mar 2011 16:15:17 +0000 (-0400)
Subject: Merge branch 'julian'
X-Git-Tag: philo-0.9~16^2~12
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/785b59352880027f54ea0e81335d179eccee75f1

Merge branch 'julian'
---

785b59352880027f54ea0e81335d179eccee75f1