git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db0947d 889f3b6)
Merge branch 'master' of git://github.com/kgodey/philo into kgodey
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:32:55 +0000 (20:32 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:32:55 +0000 (20:32 -0400)

Trivial merge
Foundation for web content management systems using Django.