Merge branch 'seventeen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Nov 2014 08:38:23 +0000 (09:38 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Nov 2014 08:38:23 +0000 (09:38 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge