From: Stefan Schantl Date: Sun, 21 Feb 2010 19:40:24 +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=60603291972e6ad83dcd48d2ff7356bedd8646bb;p=ipfire-3.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki --- 60603291972e6ad83dcd48d2ff7356bedd8646bb