git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf382c2 07c6ede)
Merge origin/master
authormelinath <stephen.r.burrows@gmail.com>
Tue, 29 Jun 2010 14:17:00 +0000 (10:17 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Tue, 29 Jun 2010 14:17:00 +0000 (10:17 -0400)

Trivial merge
Foundation for web content management systems using Django.