From: Daniel Albers <daniel@lbe.rs>
Date: Fri, 2 Aug 2019 10:48:39 +0000 (+0200)
Subject: Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel
X-Git-Tag: test-travis-01~47
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=13425536062e5cf1b2d9f0ef258f3eb9dab1923c;hp=13425536062e5cf1b2d9f0ef258f3eb9dab1923c

Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel

Closes #504.
---