git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac45967 88ec598)
Merge branch 'block_container_override'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 24 Feb 2011 16:32:11 +0000 (11:32 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 24 Feb 2011 16:32:11 +0000 (11:32 -0500)

Trivial merge
Foundation for web content management systems using Django.