Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Jan 2011 23:31:41 +0000 (00:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 3 Jan 2011 23:31:41 +0000 (00:31 +0100)
commitd22501e8132e671db2a362d95345347792f9bd31
treec57a3f2f73802e35a4a41e124cf9e32bab8a9839
parentaebf1b54e16d7c9152be5cd8aa86e764540f7a58
parentb83d68f3fd925f1361237335b92e34ac36215591
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

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