]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2138 from stefwalter/journal-combine
authorLennart Poettering <lennart@poettering.net>
Sat, 6 Feb 2016 10:30:05 +0000 (11:30 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 6 Feb 2016 10:30:05 +0000 (11:30 +0100)
Combine journal catalog entries with the same id


Trivial merge