Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:42 +0000 (07:25 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:42 +0000 (07:25 +0200)
commit58bda09b683311db948fb5be06b1521386286f03
tree13f1d8f5a3e6dcde29bb1a8c2cbea4cbe5d53675
parent95c86656e70af668d25f0a33afb3913ee5e2ded0
parente6e9a8117677eca8319982ce56aa72e93c9b407e
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen