From: Stefan Schantl Date: Tue, 1 Dec 2009 20:49:00 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-beta1~583 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=80508b5fe2699f85686b60e3b5264232f5d0d71c Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x --- 80508b5fe2699f85686b60e3b5264232f5d0d71c