Merge pull request #6365 from keszybz/fast-tests

author Martin Pitt <martinpitt@users.noreply.github.com>

Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)

committer GitHub <noreply@github.com>

Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)
author Martin Pitt <martinpitt@users.noreply.github.com>
Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)
committer GitHub <noreply@github.com>
Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
diff --cc src/journal/test-compress-benchmark.c
Simple merge
author	Martin Pitt <martinpitt@users.noreply.github.com>
	Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)
committer	GitHub <noreply@github.com>
	Fri, 28 Jul 2017 09:09:50 +0000 (11:09 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal/test-compress-benchmark.c	patch \|	diff1 \|	diff2 \|	blob \| history