]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of ssh://github.com/NewDreamNetwork/ceph
authorYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 17 Jan 2012 23:05:38 +0000 (15:05 -0800)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Tue, 17 Jan 2012 23:05:38 +0000 (15:05 -0800)

Trivial merge