]> git.ipfire.org Git - people/jschlag/pbs.git/commitdiff
Merge branch 'master' of git://git.ipfire.org/pbs
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 15 Oct 2017 14:59:19 +0000 (16:59 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sun, 15 Oct 2017 14:59:19 +0000 (16:59 +0200)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

Trivial merge