git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27bd58d 08f6ca2)
Merge branch 'master' into julian
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 5 Mar 2011 21:17:12 +0000 (16:17 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 5 Mar 2011 21:17:12 +0000 (16:17 -0500)

Trivial merge
Foundation for web content management systems using Django.