From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 11 May 2011 21:23:41 +0000 (-0400)
Subject: Merge branch 'attribute_access' into release
X-Git-Tag: philo-0.9~12^2~18
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/7f6fa6595b4c558d7a97ed00cdb19469db4919df?hp=7f6fa6595b4c558d7a97ed00cdb19469db4919df

Merge branch 'attribute_access' into release

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