git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07ce1f2 20357f9)
Merge branch 'master' into docs
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 15:03:42 +0000 (10:03 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 15:03:42 +0000 (10:03 -0500)

Trivial merge
Foundation for web content management systems using Django.