Merge branch 'develop' into syndication
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Jun 2011 22:38:28 +0000 (18:38 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 21 Jun 2011 22:38:28 +0000 (18:38 -0400)
commit5d58ac8166e024c88f70a62d4fcd6db70fa83380
tree25e9127d9eb37b9287c56f3614cad4396b6cb77f
parent819fc766fd18514fdd45cf514efdd91739210e62
parente96369a63407b44b8e363b057194a89dc4c5fd69
Merge branch 'develop' into syndication
philo/contrib/penfield/models.py