]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable
authorSage Weil <sage@newdream.net>
Thu, 1 Oct 2009 21:25:10 +0000 (14:25 -0700)
committerSage Weil <sage@newdream.net>
Thu, 1 Oct 2009 21:25:10 +0000 (14:25 -0700)

Trivial merge