Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Sun, 6 Sep 2009 09:20:38 +0000 (11:20 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Sun, 6 Sep 2009 09:20:38 +0000 (11:20 +0200)
commit69bae65f78cebfe4aee2617d7caad8963df021b8
treec3c74831dc06fb889a1ce81bc5f54bc23c0442fd
parent92a0762c33e471def9bcdefefa6b906279fb996f
parentba2c28203a83257bdf5af6aacd124e1b6a4a220f
Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x