From: Sage Weil <sage@inktank.com>
Date: Fri, 26 Jul 2013 22:14:02 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.68~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c36c280a782e72e5a7fee2d1ecad1ab17f29b98e;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/pybind/ceph_argparse.py
---

c36c280a782e72e5a7fee2d1ecad1ab17f29b98e