tree feea567421530c953822eafc2aaa8bd790708482
parent da073e94e73946b5063dfd7c684f886027b6763d
parent 789052e8a94b8e3d5cb9cbb118fb9a2174ecaf5f
author Nabin Hait <nabinhait@gmail.com> 1315372457 +0530
committer Nabin Hait <nabinhait@gmail.com> 1315372457 +0530

Merge branch 'stable'