Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
authorAlexander Marx <amarx@ipfire.org>
Wed, 2 Oct 2013 19:15:22 +0000 (21:15 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 2 Oct 2013 19:15:22 +0000 (21:15 +0200)
commit40d505ea08931038fba56ee3a8da5053ad7ed389
tree5dc8dde7a8476874bba61fb1c51ec82695e29695
parent753bb74ce55d5107d3e8001ed5c15f462261aab3
parent5b6acb88c607b2b9a46365281e611706c0c12109
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen