tree a893b98cdbabcbe5059eb7361ad7017cb2ce6eed
parent 68b9b1f11dac040d3266f90d4f22f2c461439b41
parent 3c6c3cf5ee902124f3a7e576a4865b206d4749c4
author Anand Doshi <anand@erpnext.com> 1371560441 +0530
committer Anand Doshi <anand@erpnext.com> 1371560441 +0530

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

Conflicts:
	selling/doctype/sales_order/sales_order.txt