tree e27bd9f3337d7e07ae1f04296abe9c5197870e6c
parent 165fe9e122f659915ebb4f150738a968491e6b91
parent 88ba7b86dcc08d7711ae722bbe2fafce0484832d
author Anand Doshi <anand@iwebnotes.com> 1326870196 +0530
committer Anand Doshi <anand@iwebnotes.com> 1326870196 +0530

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

Conflicts:
	index.html
	version.num