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
This commit is contained in:
Anand Doshi
2012-02-07 10:58:45 +05:30
36 changed files with 3372 additions and 3053 deletions

View File

@@ -1 +1 @@
353
353