# Version 1.3.8 2014-12-06 (cmeng)
# - Change settings for dual languages support
# - Retry if "Exception" in json data fetch
Merge branch 'master' of https://github.com/taxigps/xbmc-addons-chinese

Conflicts:
	addons.xml.md5