git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2371c4b 0d560fd)
Merge branch 'navigation'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 10 Jan 2011 16:08:45 +0000 (11:08 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 10 Jan 2011 16:08:45 +0000 (11:08 -0500)

Trivial merge
Foundation for web content management systems using Django.