Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:30 +0000 (20:30 +0200)
committerAlexander Marx <amarx@ipfire.org>
Tue, 1 Oct 2013 18:30:30 +0000 (20:30 +0200)

Trivial merge