tree ee1d22ab28f518481991a18395cd0f29dd02501e
parent 8cbbab2e752671ab6b5a9e9ad125ff43758e3997
parent af1f437fad98ae627be05542c2c0cb27df7ab92f
author Anand Doshi <anand@iwebnotes.com> 1342111579 +0530
committer Anand Doshi <anand@iwebnotes.com> 1342111579 +0530

Merge branch 'master' into dev

Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js