[libopenshot-audio/f26] (4 commits) ...Merge branch 'el7'
Summary of changes:
db28097... Initial import (*)
f8876b6... Fix conflicts with master. (*)
076144c... Fix conflicts with master. (*)
fa0e278... Merge branch 'el7' (*)
(*) This commit already existed in another branch; no separate mail sent