tree f69ef558cfd8cfea08e2f753efc2bbd164105e93
parent 08c8edb87f8669fd77318dbf89364adff076299e
parent b95ad21208d9c7f951b40923fc9269f6198ee851
author Anand Doshi <anand@iwebnotes.com> 1330593841 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330593841 +0530

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

Conflicts:
	version.num