tree cf9bfbd2cdc503607ddba8e3fca101a5ac47c070
parent 2ac0a83bd8bb923a7fca4fd4fb53a7f9755fa86d
parent 208e4f59b7f2cc845980aaa814e0bf6cd0c71fc5
author Anand Doshi <anand@erpnext.com> 1373469915 +0530
committer Anand Doshi <anand@erpnext.com> 1373469915 +0530

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

Conflicts:
	selling/doctype/quotation/quotation.py
	utilities/transaction_base.py