git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30a08f3 b2f4569)
Merge branch 'master' into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Sat, 26 Jun 2010 13:08:28 +0000 (09:08 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Sat, 26 Jun 2010 13:08:28 +0000 (09:08 -0400)

Trivial merge
Foundation for web content management systems using Django.