tree c391d4c98a1285f21e4674a2d80cb494be65720d
parent 731b15edf4cf6d98f19946ec141175473dca1cfe
parent 1b41b50a955bb1c5f42f06decf838554efe1417b
author Anand Doshi <anand@erpnext.com> 1428305374 +0530
committer Anand Doshi <anand@erpnext.com> 1428306667 +0530

Merge remote-tracking branch 'frappe/v4.x.x' into develop

Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py