git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3544655 ba508f5)
Merge branch 'master' into navigation
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 23 Dec 2010 17:08:34 +0000 (12:08 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 23 Dec 2010 17:08:34 +0000 (12:08 -0500)

Trivial merge
Foundation for web content management systems using Django.