From: Chris Riccomini <criccomi@criccomi-mn.linkedin.biz>
Date: Mon, 6 Oct 2014 15:22:55 +0000 (-0700)
Subject: merge master to resolve merge conflicts
X-Git-Tag: v3.6.1~5^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a4d6e7960b7b57ab26fd002e1e7eaf6df8b60e5;p=rocksdb.git

merge master to resolve merge conflicts
---

2a4d6e7960b7b57ab26fd002e1e7eaf6df8b60e5