xbmc/xbmc — comment on commit 121211e15b6918ea3ecd34af1a5699526d2b5162
File:  line 0
By Memphiz:

We normally don't merge branches. I for myself just cherry-pick from my dev branch. But there are different approaches out there.