Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Wed, 16 Oct 2013 12:22:38 +0000 (14:22 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 16 Oct 2013 12:22:38 +0000 (14:22 +0200)
commit769185b58ec52fcc9eaedab5df42b1b25057d0c7
treeed43ff74f820a1b5862ea49b8185290cefa040cc
parenta1e89f481d13a59a38854a3921f3c0d85a26f4dd
parentb64c3fc8a3cc9f789348d331d1e4ba78a032f612
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen