git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c79bb6f d527f10)
Merge branch 'optimization' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 26 Aug 2011 01:10:43 +0000 (18:10 -0700)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 26 Aug 2011 01:10:43 +0000 (18:10 -0700)

Trivial merge
Foundation for web content management systems using Django.