From: tamil <tamil@tamil-VirtualBox.(none)>
Date: Wed, 22 Jan 2014 01:50:22 +0000 (-0800)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.78~290
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4550fb5ff9d7fc8deffcd42d458afafbbcf3b4d8;p=ceph.git

Merge branch 'master' of github.com:ceph/ceph
---

4550fb5ff9d7fc8deffcd42d458afafbbcf3b4d8