From: Yehuda Sadeh Date: Sun, 19 Jan 2014 05:48:30 +0000 (-0800) Subject: Merge branch 'bclibcoop/next-cors' of https://github.com/BCLibCoop/ceph into next X-Git-Tag: v0.77~17 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26a534e62daaef1c08fecbe261025daf95dbdc46;p=ceph.git Merge branch 'bclibcoop/next-cors' of https://github.com/BCLibCoop/ceph into next Reviewed-by: Yehuda Sadeh --- 26a534e62daaef1c08fecbe261025daf95dbdc46