| 
							
							
								 Anand Doshi | 05aaae33ae | Merge branch 'master' of github.com:webnotes/erpnext into 1209 Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py | 2012-10-02 14:35:20 +05:30 |  |