Merge branch 'attribute_access' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:23:41 +0000 (17:23 -0400)
commit7f6fa6595b4c558d7a97ed00cdb19469db4919df
tree5153d3dfcab37cedc840ed798e19df960e359486
parent943e8bc4af0c11b0ace3811199e3b0844c4c3fbc
parent9cbb247dfb4faa47617438770bb6135155fade16
Merge branch 'attribute_access' into release

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