Merge pull request #2618 from zonque/busproxy-removal

author Lennart Poettering <lennart@poettering.net>

Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)

committer Lennart Poettering <lennart@poettering.net>

Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)
author Lennart Poettering <lennart@poettering.net>
Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)
committer Lennart Poettering <lennart@poettering.net>
Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)
diff --cc .gitignore
Simple merge
diff --cc Makefile-man.am
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc TODO
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)
committer	Lennart Poettering <lennart@poettering.net>
	Mon, 15 Feb 2016 13:54:09 +0000 (14:54 +0100)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile-man.am	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
TODO	patch \|	diff1 \|	diff2 \|	blob \| history