MSOpenTech/redis — pull request #44 by darrenfang (2013-05-16 14:29:50+00:00)
Title: remove merge conflict

Cannot complie it. Fix it now.