git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a85e27d b866872)
Merge branch 'master' of git://github.com/lapilofu/philo
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 2 Mar 2011 21:21:31 +0000 (16:21 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 2 Mar 2011 21:21:31 +0000 (16:21 -0500)

Trivial merge
Foundation for web content management systems using Django.