basho/riak_kv — pull request #519 by russelldb (2013-03-26 13:39:09+00:00)
Title: 1.3 to master

Just to verify that the merge dealt with the conflicts correctly.