]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 2 Dec 2011 20:06:50 +0000 (12:06 -0800)
committerSage Weil <sage@newdream.net>
Fri, 2 Dec 2011 20:06:50 +0000 (12:06 -0800)

Trivial merge