Merge branch 'mptt'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 29 Nov 2010 18:25:19 +0000 (13:25 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 29 Nov 2010 18:25:19 +0000 (13:25 -0500)
commit596ad981f61660468f9135255048754ccd7627fb
treefea6a785346c65368bd773fb01bfbc7aa3d0f209
parent0b461b9482695531611ca2ffca78ac4963e33a63
parent8d3b1128e7925825332eafc7d269cf34e1af170c
Merge branch 'mptt'

Conflicts:
tests.py
tests.py