]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 20:54:41 +0000 (12:54 -0800)
committerSage Weil <sage@newdream.net>
Fri, 24 Feb 2012 20:54:41 +0000 (12:54 -0800)

Trivial merge