Commit 55a25cc5 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13

Conflicts:
	CMakeLists.txt
parents 43c73057 1399e800
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment