Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:58:08 +0000 (23:58 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:58:08 +0000 (23:58 +0100)
commitdebe565b7fca362d5adc3dcf91c3c848079c1866
tree06bbcc427f56c8663faf9f86b63b72fd997dcf77
parentbf9fd3051ed99b5f0cf92ec37b7b106fb1404eaf
parentf5b23e51c46b7478e147a4fec063f74ce138b604
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x