]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Mon, 1 Aug 2011 16:50:05 +0000 (09:50 -0700)
committerSage Weil <sage@newdream.net>
Mon, 1 Aug 2011 16:50:05 +0000 (09:50 -0700)

Trivial merge