WirelessLan/plugin.py: fix merge conflict
[enigma2.git] / NEWS
2003-10-17 Felix Domkeimport of enigma2