Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Tue, 1 Dec 2009 20:49:00 +0000 (21:49 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Tue, 1 Dec 2009 20:49:00 +0000 (21:49 +0100)
commit80508b5fe2699f85686b60e3b5264232f5d0d71c
tree205141dec72220dd3a03212954e832f9e12c112c
parentc8b0d013144cb10f9a8786fb753eab35b8182a49
parent98cbb7e6827f8c66de84066db6fb84122e570209
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x