Merge branch 'master' of git://git.ipfire.org/network
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Sep 2015 19:45:30 +0000 (21:45 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Sep 2015 19:45:30 +0000 (21:45 +0200)

Trivial merge