]> git-server-git.apps.pok.os.sepia.ceph.com Git - keys.git/commitdiff
Merge branch 'master' of github.com:ceph/keys
authorSandon Van Ness <sandon@inktank.com>
Mon, 17 Sep 2012 20:46:59 +0000 (13:46 -0700)
committerSandon Van Ness <sandon@inktank.com>
Mon, 17 Sep 2012 20:46:59 +0000 (13:46 -0700)

Trivial merge