Thu, 04 Feb 2010 23:16:46 +0530 resolved merging conflicts in urls.py .
nishanth [Thu, 04 Feb 2010 23:16:46 +0530] rev 26
resolved merging conflicts in urls.py .
(0) -10 -1 +1 +10 +30 +100 +300 tip