Merge branch 'master' of git://anongit.kde.org/kdenlive

diff --cc src/docclipbase.cpp
Simple merge

diff --cc src/docclipbase.h
Simple merge

diff --cc src/projectlist.cpp
Simple merge