]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' of ssh://ceph.newdream.net/git/ceph into unstable
authorSage Weil <sage@newdream.net>
Thu, 12 Nov 2009 22:55:26 +0000 (14:55 -0800)
committerSage Weil <sage@newdream.net>
Thu, 12 Nov 2009 22:55:26 +0000 (14:55 -0800)

Trivial merge