git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15dc5db 7b3b752)
Merge branch 'optimization' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 21:13:27 +0000 (17:13 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 21:13:27 +0000 (17:13 -0400)

Trivial merge
Foundation for web content management systems using Django.