From: Arne Fitzenreiter Date: Fri, 18 Nov 2011 07:00:15 +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~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5a1afdcd9ceb098c1c569f9d3c3195f181cdcbf;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' of arne_f@git.ipfire.org:/pub/git/ipfire-2.x into next --- c5a1afdcd9ceb098c1c569f9d3c3195f181cdcbf