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