From: Michael Tremer Date: Sat, 1 Mar 2014 13:19:26 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-rc1~82 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1db04adbef997af2fba8356ef14e31db252a5cc2;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 1db04adbef997af2fba8356ef14e31db252a5cc2