Mon, 01 Feb 2010 15:16:40 +0530 resolved merging conflicts in urls.py
nishanth [Mon, 01 Feb 2010 15:16:40 +0530] rev 20
resolved merging conflicts in urls.py
(0) -10 -1 +1 tip