git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd4a5d4 1f2d631)
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)

Trivial merge
Foundation for web content management systems using Django.