git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eb3ae8 2a129b5)
Merge branch 'master' of http://git.ithinksw.org/philo
authormelinath <stephen.r.burrows@gmail.com>
Tue, 29 Jun 2010 19:08:27 +0000 (15:08 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Tue, 29 Jun 2010 19:08:27 +0000 (15:08 -0400)

Trivial merge
Foundation for web content management systems using Django.