Merge branch 'Plasma/5.7'

Authored by aspotashev on Jun 16 2016, 4:11 PM.

Description

Merge branch 'Plasma/5.7'

Merged Changes

CommitAuthorDetailsCommitted
7ceccde2e0e2D1185aspotashev
drkonqi mappings: Move baloo_file* to "frameworks-baloo|Baloo File Daemon" 
Jun 16 2016