From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Sat, 8 Oct 2011 01:07:09 +0000 (-0700)
Subject: Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release
X-Git-Tag: philo-0.9.1^2~2^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/6de576dc999886f300c5abc74f4a2433a884d3b8

Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release
---

6de576dc999886f300c5abc74f4a2433a884d3b8