git.ithinksw.org / philo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70e94a5 5da1d7a)
Merge branch 'master' into gilbert
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 31 Mar 2011 18:27:44 +0000 (14:27 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 31 Mar 2011 18:27:44 +0000 (14:27 -0400)
Conflicts:
forms/entities.py


Trivial merge
Foundation for web content management systems using Django.