Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:25:13 +0000 (22:25 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 23 Dec 2013 21:25:13 +0000 (22:25 +0100)
commit0dc552342b48c1737f20e4a591b21b9812f0c624
treec15edae61f18b47cbd4cc34f57551ef6c000d856
parent03f02bcd20f9e5c1cb0743bfe88ba02c6ad01dac
parent71f51934d73bc5d252a46776cbb9ce76a5398fb3
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen