tree 9d50e89e9313594d2d6513d03bf1d7e674f70117
parent 40ee8d64328870df33bcbdbec67d1f6fb7f93fd2
parent a50b762d360e8267f1dd7d92bf50cf1b8ae0388c
author Anand Doshi <anand@iwebnotes.com> 1330091889 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330091889 +0530

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

Conflicts:
	version.num