git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e48f4da d7454a2)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Tue, 22 Jun 2010 16:12:37 +0000 (12:12 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Tue, 22 Jun 2010 16:12:37 +0000 (12:12 -0400)

Trivial merge
Foundation for web content management systems using Django.