basho/riak_control — pull request #138 by cmeiklejohn (2013-08-16 18:09:16+00:00)
Title: Merge 1.4 into master and reconcile changes.

@jared @aberghage