curl: don't mess with the default cipher list as we can't know the format
Merge pull request #4794 from ossman/curlssl

Incompatible with Curl NSS backend
Merge pull request #4859 from MartijnKaijser/addon_sync

[add-ons] sync add-ons with repo
Merge pull request #4855 from mkortstiege/externalplayer_callback

[externalplayer] fire onplaybackstarted event - fixes #15279
Merge pull request #4169 from koying/fixdvdtouch

FIX: do not popup OSD on DVD menu with touch or mouse (fixes #14906)
Merge pull request #4687 from ruuk/textboxgettext

Add ability to get text from ControlTextBox via python and infolabels
Merge pull request #4878 from FernetMenta/xfade

ActiveAE: set stream volume to fading target if fading time is zero
Merge pull request #4881 from ace20022/json_fix

[Fix][JSON] Fix re-set locale after using yajl
Merge pull request #4891 from Memphiz/fixcximageleak

[cximage] - fix big memory leak in raw image decoder - thx to smf007 for
Merge pull request #4898 from ndogxj/patch-1

[AML] Memory leak while Dispose
Merge pull request #4883 from ruuk/deletesound

Delete sound in CActiveAE::DiscardSound
Merge pull request #4902 from FernetMenta/buf

ActiveAE: fix caching for streams
Merge pull request #4899 from Memphiz/osxsinkphysicalformat

[AE/osxsink] - don't set the altered outputformat which might have wrong channel count
Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
Merge pull request #4861 from koying/fixupperaccent

FIX: support accents in ToUpper/ToLower
Merge pull request #4895 from jmarshallnz/kill_unknown_nodetype_log

[log] remove 'Unknown nodetype' logs - they're not really useful
Revert "demuxer ffmpeg, workaround for broken probing of flac format", unneeded for ffmpeg2.2/gotham-improved

This reverts commit b38ec398546e87679f94e829eb87ed5f71a05149.
Revert "VDPAU: improve error handling, Gotham"

This reverts commit 55030587d56f54a56655fd9ad7e419e4077b7e57, which conflicts with the ffmpeg2 variant.
[depends] move ffmpeg to unified deps
[configure] remove internal ffmpeg
remove ffmpeg from tree