jsonrpc: add missing GUI.OnScreensaverActivated/OnScreensaverDeactivated notifications to the API definition
Merge pull request #4486 from Montellese/jsonrpc_screensaver_notifications

jsonrpc: add missing GUI.OnScreensaverActivated/OnScreensaverDeactivated notifications to the API definition
settings: remember whether a setting has its default value or not
[openssl] adds fix_alert_handling.patch from 0.9.8za to fix issues with github hosted repositories
Merge pull request #4484 from jmarshallnz/curl_ssl_fix

[openssl] backport fix to alert handling from openssl 0.9.8za to fix github repos
Merge pull request #4487 from Montellese/settings_defaults

settings: remember whether a setting has its default value or not
Neptune Add audio/x-flac MIME type

Change streaming FLAC MIME type from application/octet to audio/x-flac to
support Frontier Silicon systems (such as the Axis X3) that require
this. (Others don't care.)

FLAC not added to DefaultDlnaMap as * suffices.

(Commit amend: tabs --> spaces)
(Commit amend: flac --> x-flac)
Merge pull request #4479 from mossywell/master

Change FLAC MIME type
[videodb] fix crash linking a movie to a show if there's no tvshows left to link.
[videodb] show select dialog for linking a movie to a show, even if there's only one show to link to.