git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 90165f4 2a3bb0d)
Merge remote-tracking branch 'ithinksw/develop' into develop
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 23 Jun 2011 16:36:28 +0000 (12:36 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 23 Jun 2011 16:36:28 +0000 (12:36 -0400)

Trivial merge
Foundation for web content management systems using Django.