]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/stable'
authorSage Weil <sage@newdream.net>
Tue, 6 Dec 2011 01:33:57 +0000 (17:33 -0800)
committerSage Weil <sage@newdream.net>
Tue, 6 Dec 2011 01:33:57 +0000 (17:33 -0800)

Trivial merge