]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'encoding' into unstable
authorSage Weil <sage@newdream.net>
Fri, 9 May 2008 17:06:31 +0000 (10:06 -0700)
committerSage Weil <sage@newdream.net>
Fri, 9 May 2008 17:06:31 +0000 (10:06 -0700)

Trivial merge