Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:38 +0000 (20:04 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:38 +0000 (20:04 +0200)
commit3bb77d08a689ef0b4ebaa88f48a684fe85ec580d
tree246225f54ab8f57db71d4b9b647625e474c03c9c
parent16ba0c00d0d7b223682ab161c23af71315f6826a
parentfadcfb73203c97e7062828eb77360b4382555943
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen