]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge commit 'e9a70f15029d397ebf0414e5f16fda321af5f55b' into clitests-4
authorTommi Virtanen <tv@hq.newdream.net>
Wed, 12 Jan 2011 18:49:27 +0000 (10:49 -0800)
committerTommi Virtanen <tv@hq.newdream.net>
Wed, 12 Jan 2011 18:49:27 +0000 (10:49 -0800)

Trivial merge