Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen1
authorAlexander Marx <amarx@ipfire.org>
Mon, 9 Dec 2013 08:29:50 +0000 (09:29 +0100)
committerAlexander Marx <amarx@ipfire.org>
Mon, 9 Dec 2013 08:29:50 +0000 (09:29 +0100)
commita8ec686f17764d2c4e62692e7ffc94ad9cbdff53
treef6fc2abbbef97bac028db982ed3c051a7445ffcf
parent82b837cff888157358cfbfbf1a29e3dce5956ca9
parent3a3759c625c593e70a7bea479c11834152681565
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen1