From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 6 Feb 2016 10:30:05 +0000 (+0100)
Subject: Merge pull request #2138 from stefwalter/journal-combine
X-Git-Tag: v229~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=421180379fa6b57a68f26315c7af476487dfa2f0;p=thirdparty%2Fsystemd.git

Merge pull request #2138 from stefwalter/journal-combine

Combine journal catalog entries with the same id
---

421180379fa6b57a68f26315c7af476487dfa2f0