Skip to content
Commit c6a8d3e1 authored by Javier Marcet's avatar Javier Marcet
Browse files

Merge remote-tracking branch 'upstream/master' into openelec-6.0 



Signed-off-by: default avatarJavier Marcet <javier@marcet.info>
parents 539bccba 2eec9240
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment