Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	VERSION
	core/version.h
remotes/origin/epub-qtextdoc
Albert Astals Cid 13 years ago
commit 9e56fafd91

Diff Content Not Available