Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 09:06:42 +0000 (11:06 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 09:06:42 +0000 (11:06 +0200)

Trivial merge