changelog
Merge branch 'master' of github.com:alexmaloteaux/transparency-sasha-xbmc

Conflicts:
	changelog.txt
changelog