]> git-server-git.apps.pok.os.sepia.ceph.com Git - keys.git/commitdiff
Merge branch 'master' of github.com:/ceph/keys
authorDan Mick <dan.mick@inktank.com>
Mon, 4 Jun 2012 22:35:31 +0000 (15:35 -0700)
committerDan Mick <dan.mick@inktank.com>
Mon, 4 Jun 2012 22:35:31 +0000 (15:35 -0700)

Trivial merge