Git commit c56d86744e134651e74718396dc43b17c7f6ad4e by Milian Wolff.
Pushed by mwolff into branch 'master'.

Merge branch '4.2'

Conflicts:
	CMakeLists.txt

I  +3    -0    documentation/manpage/kdevmanpage.desktop     
I  +2    -0    documentation/qthelp/kdevqthelp_config.desktop     
I  +1    -0    projectmanagers/cmake/kdevcmakemanager.desktop     

http://commits.kde.org/kdevelop/c56d86744e134651e74718396dc43b17c7f6ad4e