tree 853d12db2f4789c6d33553eca0b436e623401f59
parent 4ee647e84c92cbc9c1dfff80f14c7bda4bb835fc
parent 7eee8531b2094d76b464f6491e4c6c780c7d159a
author Anand Doshi <anand@erpnext.com> 1373289840 +0530
committer Anand Doshi <anand@erpnext.com> 1373289840 +0530

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

Conflicts:
	stock/doctype/material_request/material_request.txt