xbmc/xbmc — comment on commit 68fff18a68c90ddf70fe90723135bb7a43add20c
File:  line 0
By theuni:

Please avoid these unnecessary merges. Be sure to rebase your commits on top of master first.