Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 05:17:15 +0000 (07:17 +0200)
committerAlexander Marx <amarx@ipfire.org>
Fri, 4 Oct 2013 05:17:15 +0000 (07:17 +0200)
commitb4f94285ff8ef9b347ee6f3e6fdb53e998ef63dd
tree4952eb27bee056d754324177190ea0a0a5f0c8d8
parentbcd9852e2ee73b741f5996ecc05ba3758d330fb8
parent71ed067612b0819e3708b5565ada17888594b357
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen