tree 7323f22a638781444f196345f34378bd68fa6666
parent d5c18d46d00a2964d195c00a86599d9e89218ba1
parent 140f9052a962a3c17c1f028ab03c99e72db25b5f
author Anand Doshi <anand@erpnext.com> 1378287617 +0530
committer Anand Doshi <anand@erpnext.com> 1378287617 +0530

Merge branch 'master' into customer-login