Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Fri, 27 Sep 2013 13:18:05 +0000 (15:18 +0200)
committerAlexander Marx <amarx@ipfire.org>
Fri, 27 Sep 2013 13:18:05 +0000 (15:18 +0200)
commit71670b91cccc3500d03605673f3966d669c93d70
tree5f48c6fe85586f7b70dfa505d6a377c5c755d653
parent439d2a5743d68a7b6108a8db2db91aefd9fac37c
parent2aeb4b256eb99c8971da60a5dff6bd3929270798
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen