tree b734e990c102f0148f2254ad3997fc609c28263e
parent 6243f29ab366786964a289250b0ad0c7a5d27956
parent fd03762445402f6cf79139d5f06929903e02bc9d
author Anand Doshi <anand@iwebnotes.com> 1344239596 +0530
committer Anand Doshi <anand@iwebnotes.com> 1344239596 +0530

Merge branch 'master' of github.com:webnotes/erpnext into unicode

Conflicts:
	erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py