]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/stable' into stable
authorSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 21:00:33 +0000 (13:00 -0800)
committerSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 21:00:33 +0000 (13:00 -0800)

Trivial merge