From: Arne Fitzenreiter Date: Thu, 22 May 2014 21:53:24 +0000 (+0200) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-core79~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9;p=ipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- 42c439e45d76ca42048f8cf46bf3ec9a7c7b0ad9