From: Schantl Stefan Date: Wed, 17 Feb 2010 13:22:09 +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=79cd837f4b3ac8191b0bc88143aab2c88ac144b3;p=ipfire-3.x.git Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki --- 79cd837f4b3ac8191b0bc88143aab2c88ac144b3