Merge changes Ied69a66b,I5e8081d5
commitcac7f6dc2b00b0d4e7c1d3a0229b6bc5f4bfc790
authorJan Kundrát <jkt@kde.org>
Sat, 7 Nov 2015 18:30:24 +0000 (7 19:30 +0100)
committerGerrit Code Review <noreply@kde.org>
Sat, 7 Nov 2015 18:30:25 +0000 (7 19:30 +0100)
tree97bec1a7e4309369796de048396032eb8b739d74
parent7ff5ba57a939de6dd913eac7cb4d11105f30915a
parent307ae8eb1af9654c73ff8631634c28306d681274
Merge changes Ied69a66b,I5e8081d5

* changes:
  Adding credits for Erik Quaeghebeur
  Deal with registered keywords $Junk and $NotJunk