From: Michael Tremer Date: Thu, 11 Mar 2010 16:05:17 +0000 (+0100) Subject: Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.9-beta1~412^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88a23b423d2d987e987b502c866d9bac56accd55;p=ipfire-2.x.git Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next --- 88a23b423d2d987e987b502c866d9bac56accd55