tree 396466d9c12fe0cbcef7994671206844dde9d51d
parent 7cd63b7eb847995db97b549e1dd1cd661407bd6f
parent a7b3c01ca85714aba40ebe4001cfad974448df9f
author Anand Doshi <anand@iwebnotes.com> 1326110232 +0530
committer Anand Doshi <anand@iwebnotes.com> 1326110232 +0530

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

Conflicts:
	index.html
	versions-master.db