tree 1bf92b3508782046ff3bdc1d517c3f1a884048ee
parent e306a1f5e1c44701ae9416f4e817a639676fe419
parent 06292433a6fa0e7c0e94673a28495aaf90fafab4
author Anand Doshi <anand@iwebnotes.com> 1330610316 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330610316 +0530

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

Conflicts:
	version.num