c
Merge remote-tracking branch 'origin/master'

Conflicts:
	addons.xml.md5
	repository.hdrepo.com.zip