From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 8 Feb 2011 22:10:47 +0000 (-0500)
Subject: Merge branch 'better_feeds'
X-Git-Tag: philo-0.9~20^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/5af34c3a3d2d9394b2e74d51fb8492ac0073ee31?hp=5af34c3a3d2d9394b2e74d51fb8492ac0073ee31

Merge branch 'better_feeds'
---