Merge remote-tracking branch 'amarx/difflang' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Dec 2013 11:31:19 +0000 (12:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Dec 2013 11:31:19 +0000 (12:31 +0100)

Trivial merge