dvdplayer: put line break into audio codec for consistency
Fixed: CAddon::HasSettings() was broken after a call to CAddon::SaveSettings() on creation of user settings
Merge pull request #2498 from FernetMenta/audiocodec

dvdplayer: put line break into audio codec for consistency
[jenkins] - welcome jenkins support for osx/ios/atv2/android to mainline :o) - add buildsteps for usage with jenkins
Delete settings category if it already exists in CSettingsGroup::AddCategory()
Guard against failed memory allocation in CGUIDialogVideoBookmarks::AddBookmark()
Let EventServer and other services using XBMC's Socket.h listen on IPv6 addresses.
Cosmetics: use PF_INET6 rather than AF_INET6 as arg for socket()
Merge branch 'master' into master-dev-tegra2

* master:
  Guard against failed memory allocation in CGUIDialogVideoBookmarks::AddBookmark()
  Delete settings category if it already exists in CSettingsGroup::AddCategory()
  [jenkins] - welcome jenkins support for osx/ios/atv2/android to mainline :o) - add buildsteps for usage with jenkins
  Fixed: CAddon::HasSettings() was broken after a call to CAddon::SaveSettings() on creation of user settings
  dvdplayer: put line break into audio codec for consistency
Merge branch 'IPv6PR' into master-dev-tegra2

* IPv6PR:
  Let EventServer and other services using XBMC's Socket.h listen on IPv6 addresses. Cosmetics: use PF_INET6 rather than AF_INET6 as arg for socket()