Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/jschlag/nitsi
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 9 Jun 2018 11:47:35 +0000 (13:47 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 9 Jun 2018 11:47:35 +0000 (13:47 +0200)

Trivial merge