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