git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9f444f 8ed757a)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 28 Jun 2010 20:00:30 +0000 (16:00 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 28 Jun 2010 20:00:30 +0000 (16:00 -0400)

Trivial merge
Foundation for web content management systems using Django.