tree 17823b0eb2a8f68d604f44f0094bec3cf16f6d88
parent 5bc86087fdf8b7469e19cd1f9fadfa21333a9622
parent 47d8947012d3137e198a129c23cf549fc6abcc5c
author Anand Doshi <anand@iwebnotes.com> 1349168720 +0530
committer Anand Doshi <anand@iwebnotes.com> 1349168720 +0530

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