Merge branch 'rspezial' of git://git.ipfire.org/ipfire-2.x into rspezial
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 May 2008 06:12:07 +0000 (08:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 May 2008 06:12:07 +0000 (08:12 +0200)
commit5ac0da0b63d882afd98cbb1eb2ccbdd1efd35a46
tree33eb2e47beebad6ddf492087a05b6934dd72e1fa
parent438bdd5b8c38af56266dce168466082403c13a87
parentff753a4c55c43c5888cd206c1f90dfce01a3d76f
Merge branch 'rspezial' of git://git.ipfire.org/ipfire-2.x into rspezial