git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f325ff6 a515501)
Merge branch 'master' of git://github.com/lapilofu/philo
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 26 Apr 2011 15:49:57 +0000 (11:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 26 Apr 2011 15:49:57 +0000 (11:49 -0400)

Trivial merge
Foundation for web content management systems using Django.