Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Nov 2014 10:38:45 +0000 (11:38 +0100)

Trivial merge