git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c927b03 6dc154e)
Merge remote-tracking branch 'ithinksw/develop' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sun, 10 Jul 2011 19:27:15 +0000 (15:27 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sun, 10 Jul 2011 19:27:15 +0000 (15:27 -0400)

Trivial merge
Foundation for web content management systems using Django.