Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 09:35:25 +0000 (10:35 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 09:35:25 +0000 (10:35 +0100)
commit481988c68d1380d918f42cb109a72c854826ffc7
treed24300dfc802b44841918bbfd3db1a71d795c639
parentaa8512fac63ff7451392d3d8d8114a286ec638e9
parentf7165e5aed61866f8d82141c9ac152468a964f4c
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen