- poubelle
Merge branch 'master' of github.com:octo-online/libkoca

Conflicts:
	libkoca.sh