git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93249b4 9bb81b7)
Merge branch 'julian' of git://github.com/lapilofu/philo
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 28 Mar 2011 21:16:24 +0000 (17:16 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 28 Mar 2011 21:16:24 +0000 (17:16 -0400)

Trivial merge
Foundation for web content management systems using Django.