git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bd84bc 6f2781d)
Merge branch 'master' into docs
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 21:22:46 +0000 (16:22 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 21:22:46 +0000 (16:22 -0500)

Trivial merge
Foundation for web content management systems using Django.