Collect subtitles at the same time to prevent overlap

[AE/osxsink] - fix optical usb devices with > 2 channels

[AE/osxsink] - fix wrong samplerate selection

prompt for master pin in case the addon manager is locked

[osx/depends] - add a fake Info.plist to target python26 for allowing codesign...

renderer: allow some lateness within vblank interval

FIX: [jni] typo

[osx] - only show the fake fullscreen option on snow leopard

on snowleopard - it leads to black screen on all later osx versions

[log] remove 'Unknown nodetype' logs - they're not really useful

FIX: support accents in ToUpper/ToLower

[AE/osxsink] - don't set the altered outputformat which might have wrong channel count
Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp

ActiveAE: fix caching for streams

Delete sound in CActiveAE::DiscardSound

[AML] Memory leak while Dispose

[cximage] - fix big memory leak in raw image decoder - thx to smf007 for

[Fix][JSON] Fix re-set locale after using yajl

ActiveAE: set stream volume to fading target if fading time is zero

Add ability to get text from ControlTextBox via python and infolabels

FIX: do not popup OSD on DVD menu with touch or mouse (fixes #14906)

[externalplayer] fire onplaybackstarted event - fixes #15279

[add-ons] sync add-ons with repo

Incompatible with Curl NSS backend

[linux] bad boolean type given to dbus

fixed logging of audio endpoint device id.

Gotham: backport fix dvdplayer

Gotham: fix tag read

Gotham 13.2 backports

[AE/osxsink] - fix multichannel speaker layout / channel mapping

ActiveAE: fix reset of buffering after 51ff5b6e...

Update hooks for TvTunes

[AE/osxsink] - allow up to 16 channels in osx sink - fixes #15261