Merge 'template_error_handling' bugfix.
authorStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 19 Oct 2010 14:56:15 +0000 (10:56 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Tue, 19 Oct 2010 15:07:19 +0000 (11:07 -0400)
1  2 
models/pages.py

diff --cc models/pages.py
Simple merge