git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 454e684 252fcb2)
Merge branch 'sobol-templates-hotfix'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:19 +0000 (17:21 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:19 +0000 (17:21 -0400)

Trivial merge
Foundation for web content management systems using Django.