]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 13 Jan 2012 23:57:20 +0000 (15:57 -0800)
committerSage Weil <sage@newdream.net>
Fri, 13 Jan 2012 23:57:20 +0000 (15:57 -0800)

Trivial merge