Merge pull request #536 from regit/passthru-v1.2

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

Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)

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

Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)
author Stéphane Graber <stgraber@stgraber.org>
Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)
committer Stéphane Graber <stgraber@stgraber.org>
Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)
diff --cc doc/lxc.container.conf.sgml.in
Simple merge
diff --cc src/lxc/conf.h
Simple merge
diff --cc src/lxc/confile.c
Simple merge
author	Stéphane Graber <stgraber@stgraber.org>
	Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)
committer	Stéphane Graber <stgraber@stgraber.org>
	Mon, 25 May 2015 15:51:07 +0000 (11:51 -0400)
		1	2
doc/lxc.container.conf.sgml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/conf.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/confile.c	patch \|	diff1 \|	diff2 \|	blob \| history