]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-codingstyle'
authorSage Weil <sage@newdream.net>
Thu, 14 Jul 2011 17:58:58 +0000 (10:58 -0700)
committerSage Weil <sage@newdream.net>
Thu, 14 Jul 2011 17:58:58 +0000 (10:58 -0700)

Trivial merge