From: Stefan Schantl Date: Wed, 20 Jan 2010 22:58:08 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-beta1~508^2 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=debe565b7fca362d5adc3dcf91c3c848079c1866 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- debe565b7fca362d5adc3dcf91c3c848079c1866