git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fff867 fb2124a)
Merge branch 'julian'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 22 Mar 2011 16:15:17 +0000 (12:15 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 22 Mar 2011 16:15:17 +0000 (12:15 -0400)

Trivial merge
Foundation for web content management systems using Django.