From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 21 Jun 2011 22:38:28 +0000 (-0400)
Subject: Merge branch 'develop' into syndication
X-Git-Tag: philo-0.9.1^2~8^2^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/5d58ac8166e024c88f70a62d4fcd6db70fa83380

Merge branch 'develop' into syndication
---

5d58ac8166e024c88f70a62d4fcd6db70fa83380