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)
commitc9802c5cb6ad16a895cd5434d6f7695d1ae930f7
tree9b2063b30d6cc7709e525811b4f8b74a8fdb1ef8
parent8534cc08ed41bd427c2684cb3f05fd6d06dd5a5c
parent2e5a27da22a502a56a0e1bf278b906891e502335
Merge branch 'efficient_attributes' into attribute_access

Conflicts:
philo/models/base.py
philo/models/base.py