Merge pull request #1994 from brauner/2017-12-04/bugfixes

author Stéphane Graber <stgraber@stgraber.org>

Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)

committer GitHub <noreply@github.com>

Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)
author Stéphane Graber <stgraber@stgraber.org>
Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)
committer GitHub <noreply@github.com>
Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)
diff --cc src/lxc/conf.c
Simple merge
diff --cc src/lxc/confile.c
Simple merge
author	Stéphane Graber <stgraber@stgraber.org>
	Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)
committer	GitHub <noreply@github.com>
	Wed, 6 Dec 2017 07:02:59 +0000 (23:02 -0800)
		1	2
src/lxc/conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/confile.c	patch \|	diff1 \|	diff2 \|	blob \| history