[k3b] Merging 2.0 into master

[Johannes Obermayr]

Am Sonntag, 28. September 2014, 16:01:53 schrieb Albert Astals Cid:
> Hi guys, i tried to merge 2.0 into master but the cdparanoia and the audiocd 
> refactoring conflict rather badly at least for me that don't know what's going 
> on (config-k3b.h.cmake also conflicts but the resolution is easy, just revert to 
> all the code from master)
> 
> Since you're the guys that did those changes can you have a look to merging 
> them?
> 
Done.