Nabin Hait 86375f089a Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
..
2012-05-21 15:48:21 +05:30
2012-04-13 11:41:43 +05:30
2012-03-30 12:29:06 +05:30
2012-04-13 12:18:06 +05:30
2012-04-17 11:45:35 +05:30