Merge branch 'efficient_attributes' into attribute_access
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 10 May 2011 13:58:51 +0000 (09:58 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 10 May 2011 13:58:51 +0000 (09:58 -0400)
Conflicts:
philo/models/base.py


No differences found