Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:19 +0000 (07:25 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 7 Oct 2013 05:25:19 +0000 (07:25 +0200)
commit95c86656e70af668d25f0a33afb3913ee5e2ded0
tree1a7aeec7bd3d36f7f5763d5692a152b7b512d766
parent9f6da934a3b635f5c9f96ab737977dad2582e498
parent1a3dbe91b2456323c1fe53797da673b4d0f87e17
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen