From: Schantl Stefan Date: Mon, 15 Feb 2010 19:34:01 +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=7140f08c116a96e6a532b354acafbc79e199c0d6;p=ipfire-3.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki --- 7140f08c116a96e6a532b354acafbc79e199c0d6