From: Arne Fitzenreiter Date: Thu, 5 Jan 2012 14:00:04 +0000 (+0100) Subject: Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.11-core56^2~24^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8db3d70ed8e535fda15b60330bcce557e4f07bb;p=ipfire-2.x.git Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next --- b8db3d70ed8e535fda15b60330bcce557e4f07bb