Anand Doshi e00e70841c 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
2012-02-07 10:58:45 +05:30
..
2012-02-07 10:58:45 +05:30
2012-01-30 14:00:46 +05:30