tree 0f58091eb3515105aa419bd9b6ea3a7b5f7ea9c8
parent a30fbd004ed9c0cd44f6158e7e7153379a9a64a4
parent c009450ef003cd9129383cd8e9b74bb693b1dcdf
author Anand Doshi <anand@iwebnotes.com> 1332857230 +0530
committer Anand Doshi <anand@iwebnotes.com> 1332857230 +0530

Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge

Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num