Merge branch 'Plasma/5.3'

Authored by ivan on May 7 2015, 10:29 PM.

Description

Merge branch 'Plasma/5.3'

Conflicts:
lib/kactivities-stats/src/lib/stats/resultset.cpp

Merged Changes

CommitAuthorDetailsCommitted
02766ae03148hein
Clean up some debug junk. 
May 7 2015
89e5482c75ddivan
Keeping ResultSet open as little as possible and fixing the count limit 
May 7 2015