From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 14 Oct 2010 13:57:35 +0000 (-0400)
Subject: Merge branch 'master' into flexible_attributes
X-Git-Tag: philo-0.9~29^2~8^2~3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/98bd3a178f3e62e5591e809ac61e07a5bf37c292?hp=98bd3a178f3e62e5591e809ac61e07a5bf37c292

Merge branch 'master' into flexible_attributes
---