]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Mon, 5 Dec 2011 19:21:08 +0000 (11:21 -0800)
committerSage Weil <sage@newdream.net>
Mon, 5 Dec 2011 19:21:08 +0000 (11:21 -0800)

Trivial merge