tree a66bd7df87d64be187121497396807fa900062e1
parent 6d5cd01e030249f23d305688bbb77c729d7547fb
parent d008964fd65c500dc6850d0344b453deae7b1ca4
author Anand Doshi <anand@iwebnotes.com> 1328592525 +0530
committer Anand Doshi <anand@iwebnotes.com> 1328592525 +0530

Merge branch 'stable' into latest

Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num