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