Petit test avec les actions immédiates
Merge branch 'master' of https://github.com/ldleman/yana-server
Merge branch 'master' of https://github.com/ldleman/yana-server

Conflicts:
	plugins/vocal_infos/vocalinfo.plugin.enabled.php
Merge pull request #2 from ldleman/master

Maj