Anand Doshi c97f780940 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
2012-07-12 22:16:19 +05:30
..
2012-05-23 15:12:22 +05:30
2012-07-12 22:16:19 +05:30
2012-03-30 12:29:06 +05:30
2012-03-30 12:29:06 +05:30
2012-07-11 19:18:50 +05:30
2012-07-03 12:24:18 +05:30