]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1080 from onlyjob/master
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 27 Jan 2014 22:57:06 +0000 (14:57 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 27 Jan 2014 22:57:06 +0000 (14:57 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge