Commit fe1017bb authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

Conflicts:
	akonadi/itemsearchjob.cpp
	akonadi/standardactionmanager.cpp
parents a4f60ad5 43c73057
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