WirelessLan/plugin.py: fix merge conflict
[enigma2.git] / timers.xml
2005-11-08 Stefan Plueckensample timers.xml file