git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 359b389 76d3c44)
Merge branch 'master' into julian
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 14 Feb 2011 19:13:19 +0000 (14:13 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 14 Feb 2011 19:13:19 +0000 (14:13 -0500)

Trivial merge
Foundation for web content management systems using Django.