From: Arne Fitzenreiter Date: Thu, 24 Nov 2011 19:43:10 +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~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3797305ec02cb8bc374813b1a15aea5fb9b70a48;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' of arne_f@git.ipfire.org:/pub/git/ipfire-2.x into next --- 3797305ec02cb8bc374813b1a15aea5fb9b70a48