From: Arlin Davis <arlin.r.davis@intel.com>
Date: Mon, 10 Feb 2014 17:45:35 +0000 (-0800)
Subject: Merge branch 'proxy' of ssh://beany.openfabrics.org/home/ardavis/scm/dapl into proxy
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fa11a3f1db00ece422856ec5c98c878a7ee2a32a;p=~ardavis%2Fdapl.git

Merge branch 'proxy' of ssh://beany.openfabrics.org/home/ardavis/scm/dapl into proxy
---

fa11a3f1db00ece422856ec5c98c878a7ee2a32a