tree b1cb43cc31fd38f2de1f65a0970d7e3b534020f2
parent b2be11cad111baa05ce8087fb20b7fd7dbd0dbd3
parent 05f4c290ec27a227813c1ed3e261c6e02cd2655d
author Anand Doshi <anand@iwebnotes.com> 1329203804 +0530
committer Anand Doshi <anand@iwebnotes.com> 1329203804 +0530

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

Conflicts:
	version.num