From: Schantl Stefan Date: Fri, 27 Aug 2010 12:32:59 +0000 (+0200) Subject: Merge branch 'x-server' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-3.x... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d92364abf0d34f16faaa3b68531b05c2e713c5d;p=ipfire-3.x.git Merge branch 'x-server' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-3.x into x-fixes --- 8d92364abf0d34f16faaa3b68531b05c2e713c5d