From: Sapan Bhatia <gwsapan@gmail.com>
Date: Wed, 26 Mar 2014 14:14:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
X-Git-Tag: lxc-userspace-1.0-10~1
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=bd37a163c0812d0d6751b4876dbfb7b231a8dc75

Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
---

bd37a163c0812d0d6751b4876dbfb7b231a8dc75