tree d83132b3d8f28d40d95f2759f4684df8cb1d3d76
parent ca471f41a132b081d06a9cb08bad34dff6974b77
parent d665ab2dd7c75b7ac9f944342bdfb6ca152556de
author Nabin Hait <nabinhait@gmail.com> 1384933479 +0530
committer Nabin Hait <nabinhait@gmail.com> 1384933479 +0530

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