Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 15:41:12 +0000 (16:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 15:41:12 +0000 (16:41 +0100)

Trivial merge