git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f423a51 83c66d9)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 12 May 2010 15:11:21 +0000 (11:11 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 12 May 2010 15:11:21 +0000 (11:11 -0400)

Trivial merge
Foundation for web content management systems using Django.