git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c42dde 818e3f5)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 10 Jun 2010 08:36:35 +0000 (04:36 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 10 Jun 2010 08:36:35 +0000 (04:36 -0400)

Trivial merge
Foundation for web content management systems using Django.