From: Git User <support@planet-lab.org>
Date: Thu, 7 May 2015 08:11:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/myplc-0_4-branch' into planetlab-3_3-bootcd... 
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fplanetlab-3_3-bootcd-branch;hp=024c9ef07af6679ba899a84cd5ffd95330848fa6;p=pl_sshd.git

Merge remote-tracking branch 'origin/myplc-0_4-branch' into planetlab-3_3-bootcd-branch
---