Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorroot <root@ikarus.homeip.net>
Mon, 1 Dec 2008 22:24:51 +0000 (23:24 +0100)
committerroot <root@ikarus.homeip.net>
Mon, 1 Dec 2008 22:24:51 +0000 (23:24 +0100)
commitb97ae7d966e14627aba735905c4cbdafc1ff5a93
treeb4cb6156e4fa7f09f75e4ee0e557fbbdf2772633
parent2444d31e50d04299a3e5e7decc5fc1ece46b2f0e
parent1fe3591b36d263276f959a3e484102ba967ef114
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x