git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0687ae8 21810d3)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 20 May 2010 06:12:38 +0000 (02:12 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 20 May 2010 06:12:38 +0000 (02:12 -0400)

Trivial merge
Foundation for web content management systems using Django.