Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Nov 2014 17:36:31 +0000 (18:36 +0100)

Trivial merge