tree 6b00d5b58ba85d25715b425050a31cb5fdec9dc8
parent db62876bc9ce0aa9bfaeee6fb4954c60e8ae4683
parent f6be9b27bbc4a621a7d0c9dfe0872dec0e01d608
author Anand Doshi <anand@iwebnotes.com> 1330086454 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330086454 +0530

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

Conflicts:
	version.num