From: Schantl Stefan Date: Fri, 12 Mar 2010 13:53:45 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=161a772ff83ba0ac89b9487410d4cfd5c61a118c;p=ipfire-3.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki --- 161a772ff83ba0ac89b9487410d4cfd5c61a118c