From: Sage Weil <sage@inktank.com>
Date: Fri, 27 Sep 2013 01:24:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.71~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=493427ddd6b443a511182565a574253c1d864c6f;p=ceph.git

Merge remote-tracking branch 'gh/next'

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

493427ddd6b443a511182565a574253c1d864c6f