From: Arne Fitzenreiter Date: Wed, 1 Jun 2011 12:11:18 +0000 (+0200) Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53803a28683e68cc2f59d676ad4ff733a9483e53;p=people%2Fteissler%2Fipfire-2.x.git Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next --- 53803a28683e68cc2f59d676ad4ff733a9483e53