tree 9965e78095bbabe841db51c03e48fdbbbec6f61c
parent ddf4c2655d9ec779a2c22603e465c17708b68fe8
parent 3fe9795020c42f5db2fa4937eed0b4d43b855d14
author Anand Doshi <anand@iwebnotes.com> 1323873316 +0530
committer Anand Doshi <anand@iwebnotes.com> 1323873316 +0530

Merge branch 'master' of github.com:anandpdoshi/erpnext

Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py