git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3fd012 92e8e96)
Merge branch 'shipherd_hotfix'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:19 +0000 (15:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:19 +0000 (15:49 -0400)

Trivial merge
Foundation for web content management systems using Django.