From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Wed, 21 Sep 2011 16:42:41 +0000 (-0700)
Subject: Merge branch 'master' of github.com:NewDreamNetwork/ceph
X-Git-Tag: v0.36~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdd3d1dab0e9d6c753b7cfd7913c8f91f15620a7;p=ceph.git

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

fdd3d1dab0e9d6c753b7cfd7913c8f91f15620a7