Merge pull request #2056 from evverx/expose-soft-limits-on-the-bus

author Lennart Poettering <lennart@poettering.net>

Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)

committer Lennart Poettering <lennart@poettering.net>

Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)
committer Lennart Poettering <lennart@poettering.net>
Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)
diff --cc Makefile.am
Simple merge
diff --cc src/shared/bus-util.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)
committer	Lennart Poettering <lennart@poettering.net>
	Thu, 10 Dec 2015 10:20:03 +0000 (11:20 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bus-util.c	patch \|	diff1 \|	diff2 \|	blob \| history