git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff326d8 3951a6f)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 19 May 2010 09:46:33 +0000 (05:46 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 19 May 2010 09:46:33 +0000 (05:46 -0400)

Trivial merge
Foundation for web content management systems using Django.