tree 9f8b2e3233f6fcebe455e7302d312540357d493f
parent d47e1d14b7f5eecde1e46457a57fdb6bf78f9dae
parent 75d30b803fe2820217905728ceeb8cb7d4d539ca
author Anand Doshi <anand@iwebnotes.com> 1328163265 +0530
committer Anand Doshi <anand@iwebnotes.com> 1328163265 +0530

Merge branch 'stable' into latest

Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num