]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of ssh://ceph.newdream.net/git/ceph
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 3 Feb 2011 11:53:29 +0000 (03:53 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 3 Feb 2011 11:53:29 +0000 (03:53 -0800)

Trivial merge