Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Sat, 5 Oct 2013 11:31:22 +0000 (13:31 +0200)
committerAlexander Marx <amarx@ipfire.org>
Sat, 5 Oct 2013 11:31:22 +0000 (13:31 +0200)
commit73c39dd4bda322d7d9240651c6db003bff477670
tree55cd4750723618ada782c7674cc934cf1c8fafb2
parent03dd9a2949d953e15bdaceab07af5649bfb21bd5
parent5c86caac7d382baf69b1731611e81a2b88750f2b
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen