Nabin Hait 86df78aabc fixed conflict		2012-05-23 11:33:28 +05:30
..
doctype	fixed conflict	2012-05-23 11:33:28 +05:30
page	fixes to website settings and linking import data in setup	2012-05-14 15:02:35 +05:30
__init__.py	fix in install docs	2012-04-17 11:39:18 +05:30