tree 34fe1c369313717455eb9bdc7e8eae309c4ff149
parent bdee6e074a7104969530881513eae3eabb4029d7
parent 0f3d2df8e846e7dae28b46f4b7906dcfcbfac812
author Anand Doshi <anand@erpnext.com> 1373355615 +0530
committer Anand Doshi <anand@erpnext.com> 1373355615 +0530

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

Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt