[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.
Merge pull request #4479 from mossywell/master

Change FLAC MIME type
Merge pull request #4487 from Montellese/settings_defaults

settings: remember whether a setting has its default value or not
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 #4486 from Montellese/jsonrpc_screensaver_notifications

jsonrpc: add missing GUI.OnScreensaverActivated/OnScreensaverDeactivated notifications to the API definition
Merge pull request #4463 from jmarshallnz/osx_vsync_always

[osx] vsync should default to always
Merge remote-tracking branch 'upstream/Gotham'
Factor in Boxee changes