Merge pull request #2547 from 0xAX/generalize-format-timestamp-internal
authorLennart Poettering <lennart@poettering.net>
Mon, 8 Feb 2016 20:26:39 +0000 (21:26 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 8 Feb 2016 20:26:39 +0000 (21:26 +0100)
time-util: merge format_timestamp_internal() and format_timestamp_int…


Trivial merge