Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:25:40 +0000 (23:25 +0100)
committerStefan Schantl <Stevee@ipfire.org>
Wed, 20 Jan 2010 22:25:40 +0000 (23:25 +0100)
commit4dbe43173110f92aea314fb49689ebf0850a5292
tree74e1a59442dc8f7651fc3d4f9707068ef0b58350
parentd4733815c0745989ba5e53ab0054ff9f3185a6cf
parentad5b43907892ab30fe600e1b630b0b4f5fc0f323
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x