[osx] - rename the Frameworks dir in osx bundle to "Libraries" - this restores auto-signing on mavericks (and maybe earlier) and stops the firewall popup occuring on each startup of xbmc - fixes #14984
[osx] - use strrchr in favour of search loop for crafting the
Frameworks/Libraries path
[epg] skip -/+ of 12 hours with SkipPrevious/SkipNext
[addons] prompt for master pin in case the addon manager is locked - fixes #15301
Merge pull request #4926 from Memphiz/osxfixpython

[osx/depends] - add a fake Info.plist to target python26 for allowing codesign...
[win32] Win32Directory::GetDirectory: don't allow skipping of bad chars, report error
[win32] Win32Directory::GetDirectory: don't return OK status if directory access is denied
Merge pull request #4910 from xhaggi/epg-skip-days

[epg] skip -/+ of 12 hours with SkipPrevious/SkipNext
[sysinfo/ios] - fix CSysInfo::GetKernelCpuFamily for ios (there is no way to determine "arm" during runtime - force it during compile time instead)
Merge pull request #4927 from mkortstiege/masterprompt

prompt for master pin in case the addon manager is locked
Merge branch 'master' of https://github.com/xbmc/xbmc
Samba: update to samba-3.6.24
glib: fix compilation issues.

For some reason glib doesn't find 'host' correctly. So substituted with 'build'.
Seems to work.
avahi: fix configure flags
Merge pull request #138 from quasar1/master

Sync master from test repo