git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89ccd16 77491cf)
Merge branch 'embed'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 5 Oct 2010 21:49:59 +0000 (17:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 5 Oct 2010 21:49:59 +0000 (17:49 -0400)

Trivial merge
Foundation for web content management systems using Django.