From: Kosie van der Merwe <kosie.vandermerwe@gmail.com>
Date: Thu, 24 Jan 2013 22:39:16 +0000 (-0800)
Subject: Merge branch 'master' into hotcold
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c17bd9bdaf503c967c88001a23c0a3837f7a9d9;p=rocksdb.git

Merge branch 'master' into hotcold
---

2c17bd9bdaf503c967c88001a23c0a3837f7a9d9