Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:01:11 +0000 (21:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:01:11 +0000 (21:01 +0100)
Conflicts:
config/rootfiles/packages/miniupnpd

1  2 
lfs/fireinfo

diff --cc lfs/fireinfo
Simple merge