tree c9e84a848e5c8cc27c3edeb19e9f3c78d347c5a7
parent a202f00dc0c66958dc5906626734859d713ea3d5
parent 8c0dcd383bc4440f6e07fa02683ff687ae58a887
author Anand Doshi <anand@iwebnotes.com> 1334641755 +0530
committer Anand Doshi <anand@iwebnotes.com> 1334641755 +0530

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

Conflicts:
	css/all-app.css
	version.num