From: Sage Weil <sage@inktank.com>
Date: Fri, 4 Oct 2013 04:23:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.71~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6afb16e52b6a9d83fa4729aa2341ee3bbe1eb276;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/Makefile.am
---

6afb16e52b6a9d83fa4729aa2341ee3bbe1eb276