modified:   addons.xml
	modified:   addons.xml.md5
	modified:   plugin.video.mlehd/addon.xml
	modified:   plugin.video.mlehd/changelog.txt
	modified:   plugin.video.mlehd/default.py
	modified:   zips/plugin.video.mlehd/changelog.txt
	new file:   zips/plugin.video.mlehd/plugin.video.mlehd-0.1.2.zip
Merge branch 'master' of https://github.com/LaryLoose/laryloose.xbmc-addons

Conflicts:
	addons.xml.md5

	modified:   addons.xml
	modified:   addons.xml.md5
	new file:   plugin.video.k1no/addon.xml
	new file:   plugin.video.k1no/changelog.txt
	new file:   plugin.video.k1no/default.py
	new file:   plugin.video.k1no/icon.png
	new file:   plugin.video.k1no/jsunpacker.py
	new file:   plugin.video.k1no/resources/language/English/strings.xml
	new file:   plugin.video.k1no/resources/language/German/strings.xml
	new file:   plugin.video.k1no/resources/settings.xml
	new file:   plugin.video.k1no/stream.py
	modified:   plugin.video.szenestreams/addon.xml
	modified:   plugin.video.szenestreams/changelog.txt
	modified:   plugin.video.szenestreams/jsunpacker.py
	new file:   zips/plugin.video.k1no/changelog.txt
	new file:   zips/plugin.video.k1no/icon.png
	new file:   zips/plugin.video.k1no/plugin.video.k1no-0.1.1.zip
	new file:   zips/plugin.video.k1no/plugin.video.k1no-0.1.2.zip
	new file:   zips/plugin.video.k1no/plugin.video.k1no-0.1.3.zip
	modified:   zips/plugin.video.szene-streams/changelog.txt
	new file:   zips/plugin.video.szene-streams/plugin.video.szene-streams-0.3.4.zip