tree be30c6e689623da054021c79227a95b50a0fa3b8
parent 6e174cc2c4eab37f09add2c49e6eb0b0a26bec01
parent 4b1fe0528ad3d10ae4244f5f7f9bc6b846297a6f
author Anand Doshi <anand@iwebnotes.com> 1327492677 +0530
committer Anand Doshi <anand@iwebnotes.com> 1327492677 +0530

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

Conflicts:
	version.num