Merge pull request #1426 from poettering/log-syntax

author Daniel Mack <github@zonque.org>

Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)

committer Daniel Mack <github@zonque.org>

Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)
author Daniel Mack <github@zonque.org>
Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)
committer Daniel Mack <github@zonque.org>
Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)
diff --cc src/core/socket.c
Simple merge
diff --cc src/journal/journalctl.c
Simple merge
author	Daniel Mack <github@zonque.org>
	Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)
committer	Daniel Mack <github@zonque.org>
	Thu, 1 Oct 2015 07:46:09 +0000 (09:46 +0200)
		1	2
src/core/socket.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/journal/journalctl.c	patch \|	diff1 \|	diff2 \|	blob \| history