SVN commit 13102 by tcberner: svn merge -cr13101 ^/branches/plasma5
_M . (directory) M +8 -1 QT/devel/qt5-qdoc/Makefile A QT/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp branches/plasma5/QT/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp#13101
