]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2564 from poettering/fix-2467
authorDaniel Mack <github@zonque.org>
Wed, 10 Feb 2016 12:39:48 +0000 (13:39 +0100)
committerDaniel Mack <github@zonque.org>
Wed, 10 Feb 2016 12:39:48 +0000 (13:39 +0100)
Fix for #2467

1  2 
src/basic/time-util.h
src/core/dbus-unit.c

Simple merge
Simple merge