Merge "Deadlock detection by owner"
[music.git] / .gitmodules