xbmc/xbmc — pull request #5215 by Montellese (2014-08-14 07:38:29+00:00)
Title: videodb: fix GetMusicVideoAlbumsNav() in combination with masterlocks (fixes #15385)

Cherry-picked from master. This PR is against **Gotham**!