Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)
committerManiacikarus <maniacikarus@ipfire.org>
Fri, 12 Dec 2008 22:49:36 +0000 (23:49 +0100)
commit46c78ea98bdbeb03ca9c0c1ead293b974e897abb
treec39875e21a15d4b2ab8038f8e0cc7497555ef60a
parente55a2b8124b30e8f605dfa5c331782141c976477
parentcab25d67ad7f0b0efec2332ae9dddf3c8d380e89
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x