From: Arne Fitzenreiter Date: Fri, 9 Dec 2011 18:25:03 +0000 (+0100) Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-core54~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3f7164f985b1af190e18f45c1d86ad59bd671d3;p=ipfire-2.x.git Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next --- a3f7164f985b1af190e18f45c1d86ad59bd671d3