Merge remote-tracking branch 'mfischer/screen' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:26:36 +0000 (17:26 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:26:36 +0000 (17:26 +0100)

Trivial merge