From: Serge Hallyn <serge@hallyn.com>
Date: Mon, 26 Jun 2017 14:13:47 +0000 (-0500)
Subject: Merge pull request #1639 from brauner/2017-06-23/lxc_2_1_preparations
X-Git-Tag: lxc-2.1.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c949f5cc0e5bdbc1ceffb673731e4027c3e92302;p=thirdparty%2Flxc.git

Merge pull request #1639 from brauner/2017-06-23/lxc_2_1_preparations

confile: prepare for 2.1.
---

c949f5cc0e5bdbc1ceffb673731e4027c3e92302