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)
commit1bbc591d4dcce94f85bc7f1de7d49f4a42d828b6
tree9d8d798b7d996f8a68c6c1e652b98814731c4e86
parentb76a0377bece73e0ac34ac310b2a8b2fcb8813c7
parent7b6d7c6938e0fee73bb9774ce3a9b6b1c4c83e12
Merge branch 'seventeen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen
make.sh