From: Sapan Bhatia <gwsapan@gmail.com>
Date: Fri, 28 Jun 2013 16:53:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-userspace
X-Git-Tag: lxc-userspace-1.0-3~1
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=9aeaf209864065305bbd6edb584b0c9735df8126

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

9aeaf209864065305bbd6edb584b0c9735df8126