git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fda97c2 6e0f75a)
Merge remote branch 'ithinksw/master' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 26 May 2011 16:27:45 +0000 (12:27 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 26 May 2011 16:27:45 +0000 (12:27 -0400)

Trivial merge
Foundation for web content management systems using Django.