From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 14 Oct 2010 16:43:56 +0000 (-0400)
Subject: Merge branch 'flexible_attributes'
X-Git-Tag: philo-0.9~29^2~8
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/1d3756407233b937d7491bde6dd4046fb8b4b6d6?ds=sidebyside

Merge branch 'flexible_attributes'
---

1d3756407233b937d7491bde6dd4046fb8b4b6d6