From: Schantl Stefan Date: Sun, 22 Aug 2010 15:45:22 +0000 (+0200) Subject: Merge branch 'x-server' into qt-framework X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af3b31038717dc06600bec676a2e2d56c2aafed9;p=ipfire-3.x.git Merge branch 'x-server' into qt-framework --- af3b31038717dc06600bec676a2e2d56c2aafed9