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
Mon, 01 Feb 2010 15:11:50 +0530 mergehg sthg st
nishanth [Mon, 01 Feb 2010 15:11:50 +0530] rev 19
mergehg sthg st
(0) -10 -2 +2 tip