From: Christian Schmidt Date: Fri, 18 Dec 2009 09:01:50 +0000 (+0100) Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x X-Git-Tag: v2.9-beta1~568 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c7eab600909fdcbdc25f3d95dde9422aacf5fd72 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x --- c7eab600909fdcbdc25f3d95dde9422aacf5fd72