tree a5a04a36f6a34e12dfa206eb70b50e12305248b4
parent 4a84b039df7b73361706d5c0c77b2e8d836fbf23
parent 22c0d78ef41f460de473bfb2e72baaecaf55d7a7
author Anand Doshi <anand@erpnext.com> 1383633608 +0530
committer Anand Doshi <anand@erpnext.com> 1383633608 +0530

Merge branch '1310' of github.com:webnotes/erpnext