tree abac1667132f7bb6afc988c527b855e63a4f6219
parent 46220f9fab6f8e75afb6849f04dd482acd56f451
parent c8380bfed4cf816887b2aec3bfd8c7f217db4011
author Nabin Hait <nabinhait@gmail.com> 1384935676 +0530
committer Nabin Hait <nabinhait@gmail.com> 1384935676 +0530

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