git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bd249d 2b80832)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 23 Jun 2010 16:28:12 +0000 (12:28 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 23 Jun 2010 16:28:12 +0000 (12:28 -0400)

Trivial merge
Foundation for web content management systems using Django.