Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire...
authorAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 06:09:18 +0000 (08:09 +0200)
committerAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 06:09:18 +0000 (08:09 +0200)
commit9f6da934a3b635f5c9f96ab737977dad2582e498
tree9650f17bb1aed7e77030ab25f8ef81f7cb31938a
parentb4f94285ff8ef9b347ee6f3e6fdb53e998ef63dd
parent03dd9a2949d953e15bdaceab07af5649bfb21bd5
Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen