Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@VMipfire.pfeiffer-privat.de>
Thu, 12 Nov 2009 09:10:27 +0000 (10:10 +0100)
committerroot <root@VMipfire.pfeiffer-privat.de>
Thu, 12 Nov 2009 09:10:27 +0000 (10:10 +0100)
commit6c29b4724b608b3dc5a757b25c23ce74e9b9f013
treec56feb001f47047dbddeba2a3c77c7c011bcaa96
parent45192ff26f1df58f9e9a46b8ced02d058949e643
parent715014d0c86966cd8de069d3991787dc57282f9f
Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x