tree a19178466456c25acef2436855fbe9c04b03b00c
parent 36f5e257ed770b41eb9adfa4e033e99761829dcc
parent cbf181c390fbc2c70506ad11c39b28cfbc5f7c8b
author Anand Doshi <anand@iwebnotes.com> 1340889057 +0530
committer Anand Doshi <anand@iwebnotes.com> 1340889057 +0530

Merge branch 'master' into dev

Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py