git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72467c5 9ccb806)
Merge branch 'master' of http://git.ithinksw.org/philo
authormelinath <stephen.r.burrows@gmail.com>
Thu, 1 Jul 2010 06:38:00 +0000 (02:38 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Thu, 1 Jul 2010 06:38:00 +0000 (02:38 -0400)

Trivial merge
Foundation for web content management systems using Django.