Merge branch '5.0'

Authored by mwolff on Nov 1 2015, 5:33 PM.

Description

Merge branch '5.0'

Merged Changes

CommitAuthorDetailsCommitted
3c220337fb37mwolff
Revert "Add assistants to the "argument hints" code completion" 
Nov 1 2015
eebb47fec45dmwolff
Revert "Remove assistant popup" 
Nov 1 2015
9cbe01a9c217mwolff
Revert "Move assistant completion to its own KTextEditor::CompletionModel" 
Nov 1 2015

Empty Commit

This commit is empty and does not affect any paths.