From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 27 Apr 2011 19:04:12 +0000 (-0400)
Subject: Merge branch 'core-1.3-updates' into release
X-Git-Tag: philo-0.9~12^2~35
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/bf7348280872f3e17f6cb766f27d57c41d9e2ae0

Merge branch 'core-1.3-updates' into release
---

bf7348280872f3e17f6cb766f27d57c41d9e2ae0