git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc77a18 51af4db)
Merge branch 'master' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 14 Jun 2011 23:24:09 +0000 (19:24 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 14 Jun 2011 23:24:09 +0000 (19:24 -0400)

Trivial merge
Foundation for web content management systems using Django.