git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 993f653 e18b86f)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Jun 2010 15:31:37 +0000 (11:31 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Jun 2010 15:31:37 +0000 (11:31 -0400)

Trivial merge
Foundation for web content management systems using Django.