Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:11:57 +0000 (20:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:11:57 +0000 (20:11 +0100)
Conflicts:
make.sh


Trivial merge