]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/stable'
authorSage Weil <sage@newdream.net>
Mon, 12 Dec 2011 17:20:26 +0000 (09:20 -0800)
committerSage Weil <sage@newdream.net>
Mon, 12 Dec 2011 17:20:26 +0000 (09:20 -0800)

Trivial merge