tree f3c186b21a85c111389f4f544f970bea13ac24e0
parent a292b44df30fe9ea9d93c5f584deb52ffc9e3b49
parent 8faa90fb203e00df38436695c8aab397c9e96c5c
author Rushabh Mehta <rmehta@gmail.com> 1373914646 +0200
committer Rushabh Mehta <rmehta@gmail.com> 1373914646 +0200

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

Conflicts:
	stock/doctype/purchase_receipt/purchase_receipt.js