]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Sat, 28 Jan 2012 18:04:45 +0000 (10:04 -0800)
committerSage Weil <sage@newdream.net>
Sat, 28 Jan 2012 18:04:45 +0000 (10:04 -0800)

Trivial merge