git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 088e70a ee5fbe5)
Merge branch 'core-1.3-updates' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 19:04:12 +0000 (15:04 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 27 Apr 2011 19:04:12 +0000 (15:04 -0400)

Trivial merge
Foundation for web content management systems using Django.