Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 06:09:18 +0000 (08:09 +0200)
committerAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 06:09:18 +0000 (08:09 +0200)

Trivial merge