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

Merge branch 'syndication' into develop
---

38c41a266b4e9a19249815559c1615867298359c