git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85b185c 6a19078)
Merge branch 'master' of http://github.com/ithinksw/philo
authormelinath <stephen.r.burrows@gmail.com>
Tue, 6 Jul 2010 17:26:20 +0000 (13:26 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Tue, 6 Jul 2010 17:26:20 +0000 (13:26 -0400)

Trivial merge
Foundation for web content management systems using Django.