From: Yueh-Hsuan Chiang <yhchiang@fb.com>
Date: Fri, 4 Apr 2014 00:14:10 +0000 (-0700)
Subject: Merge branch 'master' into jni
X-Git-Tag: v2.8~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3699fda6c794056cf61f808d94dfdd336cca0c8b;p=rocksdb.git

Merge branch 'master' into jni
---

3699fda6c794056cf61f808d94dfdd336cca0c8b