Merge branch 'master' of github.com:zhongjiewu/voldemort
commit9bb1704a6f1ec6be1fbf0a05626c6f62de79e409
authorZhongjie Wu <www.zj30@gmail.com>
Thu, 7 Jun 2012 23:24:25 +0000 (7 16:24 -0700)
committerZhongjie Wu <www.zj30@gmail.com>
Thu, 7 Jun 2012 23:24:25 +0000 (7 16:24 -0700)
tree9914b369616889c557626d6c87619133e7b2f01a
parentb3e72124eacbf68d2b2070c04e755ca6e6bbc4a9
parentc709be8f0ef5ec3babb0d68f6ab5c111d73640a4
Merge branch 'master' of github.com:zhongjiewu/voldemort