]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-1477'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 14 Sep 2011 23:05:42 +0000 (16:05 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 14 Sep 2011 23:05:42 +0000 (16:05 -0700)

Trivial merge