]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage.weil@dreamhost.com>
Sun, 6 Mar 2011 05:27:13 +0000 (21:27 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Sun, 6 Mar 2011 05:27:13 +0000 (21:27 -0800)

Trivial merge