]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of ssh://skinny/home/yehudasa/ceph
authorYehuda Sadeh <yehuda.sadeh@dreamhost.com>
Thu, 8 Mar 2012 06:58:42 +0000 (22:58 -0800)
committerYehuda Sadeh <yehuda.sadeh@dreamhost.com>
Thu, 8 Mar 2012 06:58:42 +0000 (22:58 -0800)

Trivial merge