From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Dec 2013 11:31:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'amarx/difflang' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=30f08bcf80c4c016cdc1f025cc2fbd5533ef20b9

Merge remote-tracking branch 'amarx/difflang' into fifteen
---

30f08bcf80c4c016cdc1f025cc2fbd5533ef20b9