]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-object-corpus.git/commitdiff
Merge remote-tracking branch 'cc/cuttlefish'
authorSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 20:32:12 +0000 (13:32 -0700)
committerSage Weil <sage@inktank.com>
Fri, 12 Jul 2013 20:32:12 +0000 (13:32 -0700)

Trivial merge