tree d583147f70a95690edfa94627516bcd9a7423ad2
parent 48bd4a1deddaeb3d6faf7af8a3de49c82488eb38
parent b5a58c8a8fd65971397c85b82abf3e4942399c07
author Nabin Hait <nabinhait@gmail.com> 1384758804 +0530
committer Nabin Hait <nabinhait@gmail.com> 1384758804 +0530

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