git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 046b58e 818e3f5)
Merge branch 'master' into cleanup
authormelinath <stephen.r.burrows@gmail.com>
Thu, 10 Jun 2010 14:56:38 +0000 (10:56 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Thu, 10 Jun 2010 14:56:38 +0000 (10:56 -0400)

Trivial merge
Foundation for web content management systems using Django.