git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffac3a 730e805)
Merge branch 'release' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 3 Jun 2011 16:37:50 +0000 (12:37 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 3 Jun 2011 16:37:50 +0000 (12:37 -0400)

Trivial merge
Foundation for web content management systems using Django.