tree 6efccf304f9a11514b6c00ee16bae46c637f4e0a
parent 902687091c4f1e11b1677a897a2f05af253836f6
parent 457743941ccf9bfb5f4dca25df255026fa06689a
author Anand Doshi <anand@iwebnotes.com> 1332402932 +0530
committer Anand Doshi <anand@iwebnotes.com> 1332402932 +0530

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

Conflicts:
	version.num