tree ddceda54c3b88ddcb184f4e1ea8a592ca62a8c36
parent 1f4efc77ac46c1663015c07b211e83b0315c87bf
parent b6023a4d3428c66b937d78323d97958ea29bc5cc
author Anand Doshi <anand@iwebnotes.com> 1330590083 +0530
committer Anand Doshi <anand@iwebnotes.com> 1330590083 +0530

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

Conflicts:
	version.num