Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 4 Nov 2014 22:52:28 +0000 (23:52 +0100)

Trivial merge