tree 8398f1182b5505afd139d482e7d32e7bdaaf483a
parent 9e5da835ecc666186a24041b7150022fa714b6b3
parent 3d39b4c0d60f34ee6cb6ab861421942b2c5ddc95
author Nabin Hait <nabinhait@gmail.com> 1384435223 +0530
committer Nabin Hait <nabinhait@gmail.com> 1384435223 +0530

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