]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #5191 from keszybz/tweaks
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 1 Feb 2017 15:27:32 +0000 (10:27 -0500)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 1 Feb 2017 15:27:32 +0000 (10:27 -0500)
1  2 
src/core/timer.c
src/journal/journal-file.c

Simple merge
Simple merge