]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of github.com:ceph/ceph
authortamil <tamil@tamil-VirtualBox.(none)>
Wed, 22 Jan 2014 01:50:22 +0000 (17:50 -0800)
committertamil <tamil@tamil-VirtualBox.(none)>
Wed, 22 Jan 2014 01:50:22 +0000 (17:50 -0800)

Trivial merge