Merge pull request #4612 from keszybz/format-strings

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)

committer GitHub <noreply@github.com>

Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)
committer GitHub <noreply@github.com>
Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/core/main.c
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)
committer	GitHub <noreply@github.com>
	Tue, 8 Nov 2016 13:09:40 +0000 (08:09 -0500)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history