WirelessLan/plugin.py: fix merge conflict
[enigma2.git] / GlobalActions.py
2006-01-15 Andreas Monzneradd a global ActionMap