From: Stefan Schantl Date: Thu, 18 Feb 2010 09:25:48 +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=df6d38a95b1b260e6fc30c10a9d897bdd7bc2c28;p=ipfire-3.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki --- df6d38a95b1b260e6fc30c10a9d897bdd7bc2c28