tree 81174cf6bb97c5a813c8678015212cd087513614
parent cfdccf3bfbf42d534f3857ddb082bb4320c4dcda
parent 1c2be25ec0f71c3bcd2f7f72eb8f7746388cdb1e
author Nabin Hait <nabinhait@gmail.com> 1312964098 +0530
committer Nabin Hait <nabinhait@gmail.com> 1312964098 +0530

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