Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:05 +0000 (20:04 +0200)
committerAlexander Marx <amarx@ipfire.org>
Mon, 30 Sep 2013 18:04:05 +0000 (20:04 +0200)
commit16ba0c00d0d7b223682ab161c23af71315f6826a
tree1a052dff66feccb8abf3f455413f6b47d07898cd
parent71670b91cccc3500d03605673f3966d669c93d70
parent83dfa1d7b2e5946a9405a27dba9b3a81d958baee
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen