tree 10e1f85a306873b98d70a19174d5ffd8a0e5bd36
parent ce43fc0b961db35e05e287ec12455369a2a4ec39
parent 1061b4a7eae3b090239670360086a389190f00f1
author Anand Doshi <anand@iwebnotes.com> 1327324293 +0530
committer Anand Doshi <anand@iwebnotes.com> 1327324293 +0530

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

Conflicts:
	index.html
	version.num