Merge branch 'flexible_attributes'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 16:43:56 +0000 (12:43 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 14 Oct 2010 16:43:56 +0000 (12:43 -0400)
commit1d3756407233b937d7491bde6dd4046fb8b4b6d6
tree18d1218004f86a61ac64bedb26df4d7625238e5e
parentbd4a5d4671708123a15b7f034508926d68ae71f4
parent1f2d63153b1c7ec9a6582992e356939c662657cf
Merge branch 'flexible_attributes'