Merge branch 'develop' into fast_containers
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 27 Jun 2011 14:11:50 +0000 (10:11 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 27 Jun 2011 14:11:50 +0000 (10:11 -0400)
commit1b86deeeaf9c98d994e95b983c44a82e004275b0
treefbd8946a59c9998655c485deafb1569c9b27010c
parent2b9255e08e751c9653078a087b59f4d5169c34fe
parent34a9cd2a670e84771d1d54e6fd6af87bcb1c279c
Merge branch 'develop' into fast_containers

Conflicts:
philo/templatetags/containers.py
philo/templatetags/containers.py