From: Michael Tremer Date: Mon, 16 Dec 2013 11:31:19 +0000 (+0100) Subject: Merge remote-tracking branch 'amarx/difflang' into fifteen X-Git-Tag: v2.15-beta1~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30f08bcf80c4c016cdc1f025cc2fbd5533ef20b9;p=ipfire-2.x.git Merge remote-tracking branch 'amarx/difflang' into fifteen --- 30f08bcf80c4c016cdc1f025cc2fbd5533ef20b9