git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed6b987 dbfa704)
Merge branch 'docs' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 21:07:41 +0000 (17:07 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 21:07:41 +0000 (17:07 -0400)

Trivial merge
Foundation for web content management systems using Django.