Merge branch 'develop' into syndication
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 4 Jun 2011 00:37:52 +0000 (20:37 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 4 Jun 2011 00:37:52 +0000 (20:37 -0400)
commit45be080dd7108e1d2effe22eedb5106501cd6408
treed84757edb1acdc76c40db0b2c34e01c4cd29f9e7
parentf7ddb23b308a6b409ace28e0517e3a67f5329ce5
parent093ad8d3312e2ba27730f8f5c915ca113ce72041
Merge branch 'develop' into syndication
philo/contrib/penfield/models.py