message de commit
plugin optimized
fix bug, add getnexshow function
Update ignored files
Merge branch 'master' of ssh://git.neotique.fr:5821/demonstrateur/plugin-programmetv

Conflicts:
	lisa/plugins/ProgrammeTV/modules/programmetv.py
Debug
Cron syntax in JSON
Ignored translation files
What plugin can do
Merge branch 'gilles' into 'master'

Gilles
debug
Merge branch 'gilles' into 'master'

Gilles
Translation in NeoConv Issue Neotique#2
Merge branch 'gilles' into 'master'

Gilles