Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Jul 2009 18:04:39 +0000 (20:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Jul 2009 18:04:39 +0000 (20:04 +0200)
commit54585197dac3b4fb7413a25d035aba0dd179879e
treee832134d5ff578b251669f8e0dc42707ca378324
parentb276b2a268207b1329c0e50b23043ad1e845d846
parentf6a6ea8d5ea0bf9a9344d99b0715e5a3fad1476a
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
config/rootfiles/core/29/filelists/files
config/rootfiles/core/29/filelists/files