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)
commit24f1f6ce6104b1b7afdef9caa7140d704f23d1c8
treeef09143318a4d19ee7956670f04880fec3abb760
parentd4e6e4ce5d57707e9e36b53ecf9106f88a707ec4
parent9aa36230a5d5001b10a78cc74a9661c8ac000e1d
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
config/rootfiles/packages/miniupnpd
lfs/fireinfo