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 05:44:29 +0000 (07:44 +0200)
committerAlexander Marx <amarx@ipfire.org>
Tue, 1 Oct 2013 05:44:29 +0000 (07:44 +0200)
commit4c27368a7bc135dc4443711c4eeabec0885ce1ff
tree617689d7dbe7866023efe8132de80cab4ed15775
parentfadcfb73203c97e7062828eb77360b4382555943
parent42e4fa805ec8c3bbc085d2d9d8746afd97062009
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen