From: Dan Mick <dan.mick@inktank.com>
Date: Mon, 4 Jun 2012 22:35:31 +0000 (-0700)
Subject: Merge branch 'master' of github.com:/ceph/keys
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a462616f033ca52138f17baffcb9723f523cc25b;p=keys.git

Merge branch 'master' of github.com:/ceph/keys
---

a462616f033ca52138f17baffcb9723f523cc25b