Nabin Hait 86375f089a Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
..
2012-04-02 19:12:29 +05:30
2012-05-02 12:23:44 +05:30
2012-05-21 15:48:21 +05:30
2012-05-21 15:48:21 +05:30