Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Tue, 24 Nov 2009 21:12:28 +0000 (22:12 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Tue, 24 Nov 2009 21:12:28 +0000 (22:12 +0100)
commitd310033889c0afd5948e0e61bef439221b58f8f0
treea3ac2cdcc224fca5e7b247690e34a0708aec1fbf
parent58c1bbd5e3cb2faf7f04ae9c321354ece050818f
parente1dd2bb9b2adc1a6e84608f2d06e7fc6a2d6f001
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x