tree c02f0f25c752c20c9c471d425876266cea26bee5
parent cf1e0508afcf6267b5bb00cfd272ac8159f605f0
parent 12ec71781db227f9356454fa78f0f00e32a7e78f
author Nabin Hait <nabinhait@gmail.com> 1495631313 +0530
committer Nabin Hait <nabinhait@gmail.com> 1495631313 +0530

Merge branch 'hotfix'