From: Arne Fitzenreiter Date: Sun, 13 Nov 2011 13:57:31 +0000 (+0100) Subject: Merge branch 'next' of arne_f@git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-core54~13^2~12 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0ea94a7a30718f9c1b94c7751571ff3f4f7fee7c Merge branch 'next' of arne_f@git.ipfire.org:/pub/git/ipfire-2.x into next --- 0ea94a7a30718f9c1b94c7751571ff3f4f7fee7c