From: Arne Fitzenreiter Date: Wed, 19 Mar 2014 18:07:27 +0000 (+0100) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-rc1~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cec275c9dfd9f614c94f10c636bdbeba09427272;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- cec275c9dfd9f614c94f10c636bdbeba09427272