From: Arne Fitzenreiter Date: Mon, 22 Aug 2011 18:53:02 +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/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d1bd615e9f10000bcf307e984a78a1ba384231cd Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next --- d1bd615e9f10000bcf307e984a78a1ba384231cd