From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 13:59:25 +0000 (+0100) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5db5319e404da77b8ff488f8955da38f61b74c18;p=people%2Fteissler%2Fipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- 5db5319e404da77b8ff488f8955da38f61b74c18