tree 7c0f426be46fe11c7d734d574b66e7fcebcbacf6
parent bddd5d9b0c3a761121d41c49457e4b1d4402094f
author Anand Doshi <anand@erpnext.com> 1368085873 +0530
committer Anand Doshi <anand@erpnext.com> 1368085873 +0530

[rename] [fix] merge related fixes