tree 77ee3b9d274bd9efc4f66963c6933e00221c0d66
parent 5717fe3abade77b7390240717dfa288525615017
parent 47ef15b04ba78ee875c81bb496b9f985b77f3117
author Anand Doshi <anand@erpnext.com> 1366202048 +0530
committer Anand Doshi <anand@erpnext.com> 1366202048 +0530

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

Conflicts:
	stock/doctype/delivery_note_item/delivery_note_item.txt