tree a17ed42b1bb48ec5c810c8a9087b7dcf86cff36a
parent e68a1e5ecc9949519c54e48ac201b055cf337ef0
parent 07a36a4baa7d2d57bd9e9f75ed992d0a6486d3d7
author Anand Doshi <anand@iwebnotes.com> 1330347758 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330347758 +0530

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

Conflicts:
	version.num