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