From: Michael Tremer Date: Tue, 11 May 2010 20:35:19 +0000 (+0200) Subject: Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=282f0e23799fda42ce2086e1c661ee200e65c142;p=ipfire-3.x.git Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next --- 282f0e23799fda42ce2086e1c661ee200e65c142