From: Arne Fitzenreiter Date: Wed, 5 Oct 2011 18:21:54 +0000 (+0200) Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-core54~13^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=974bbb7977c887abbc15d67dafc947727e775153;p=ipfire-2.x.git Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next --- 974bbb7977c887abbc15d67dafc947727e775153