]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Tue, 27 Sep 2011 04:49:12 +0000 (21:49 -0700)
committerSage Weil <sage@newdream.net>
Tue, 27 Sep 2011 04:49:12 +0000 (21:49 -0700)

Trivial merge