Merge branch 'shipherd_hotfix' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:35 +0000 (15:49 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 4 May 2011 19:49:35 +0000 (15:49 -0400)
commitfb8a270fa22abc217efc471d860c76d5a2352c61
tree77a6b601663fc3252b3f6bba8d3043115a946c77
parent4e50e94d757fc254b6378997d69887a28ff44297
parent92e8e96c8d6814f3bd93ecd82d8da2ccb43e13c4
Merge branch 'shipherd_hotfix' into release
philo/contrib/shipherd/templatetags/shipherd.py