tree ed77fdf1d9ebf1a31b05f3f4868a666cd30e4c6e
parent afe93d633ca0320d5e57fbb4b2049be71bbc5524
parent cd20717c3d1f45da835d872ccaed7ce099920e85
author Nabin Hait <nabinhait@gmail.com> 1390222788 +0530
committer Nabin Hait <nabinhait@gmail.com> 1390222788 +0530

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