Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
bluez: obexd: also load services/obexd.conf
connman: update to connman-8378438
xbmc: update to xbmc-12.2-8e195d7

Signed-off-by: Stephan Raue <stephan@openelec.tv>
service.openelec.settings: update upstream patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
xbmc: update advancedsettings.xml

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc: update to xbmc-12.2-5ba69b6

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Revert "mysql: build with system ssl and zlib support"

This reverts commit 04987647c79204bd957a913c9898895ace59c4e0.
Revert "mysql: some mysql-server fixes and rework"

This reverts commit 178b417a675e65f73fad3e3f6f6a9aa0f58a116d.
Revert "mysql: update to mysql-5.6.13, add initial and optional support for mysql server - dont use it, it will be changed later\!"

This reverts commit 85c77b5252c91a30102a1d53a86b8b9a9f7eb423.
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Merge branch 'openelec-3.2' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2