git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c8fa4a 1cd3ce0)
Merge branch '0.9.X' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 15 Jun 2011 21:55:14 +0000 (17:55 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 15 Jun 2011 21:55:14 +0000 (17:55 -0400)

Trivial merge
Foundation for web content management systems using Django.