[fix][ios] ping ; timeout option not supported
Merge pull request #2887 from t4-ravenbird/ios-ping

[fix][ios] ping ; timeout option not supported
[FreeBSD] ping use -t for timeout like OSX
[mingw] added pkg-config to fix configure finding not all available libs
Revert "ffmpeg: fixup compile error in patch"

This reverts commit fcbc5e9a2a320c0b3bb6d6555143e863f1db3158.
Revert "vaapi: don't unmap non-existing buffer"

This reverts commit c1597430e6d2dfd6b644be0345e0df9e0fe44336.
Revert "ffmpeg: add patch file for vaapi fix"

This reverts commit 4f47cfc9726c46ee69c72bdc4a28c15f1caea342.
[ffmpeg] - backport fix for crashing when using vaapi (found on libav mailing list) - this was signed off by elupus
gui: list settings didn't display indentation properly
[rbp] Avoid overflow in version string

gedit complains about invalid characters when opening xbmc.log file produced by pi
Since the change from perforce revision number to git hash, the version string has increased in size.

Fortunately we don't overrun the "response" buffer.
Unfortunately when buffer doesn't fit, it is not null terminated, so logging message pulls in garbage.

Version string looks like:
Jun 17 2013 20:49:11
Copyright (c) 2012 Broadcom
version d380dde43fe729f043befb5cf775f99e54586cde (clean) (release)

So, 80 characters is not enough (it is about 115 plus newlines).
160 seems more than enough, but truncate the string just in case.
Merge pull request #2888 from popcornmix/version_overflow

[rbp] Avoid overflow in version string
[osx] fix app start on 10.9
Merge pull request #2891 from amet/fix_mavericks

[osx] fix app start on 10.9
[Confluence] Cosmetics: ditch duplicate brackets
Merge pull request #2897 from ronie/confluence-cosmetics

[Confluence] Cosmetics: ditch duplicate brackets
add xbmc-addon-bindings to depends
changed, add XBMCROOT env var so we know where <xbmc root> is via an absolute path
[lang] update of internal addon language files
[lang] update of core language files
[lang] update of skin.confluence language files