1. 2015-11-03 [kde-doc-english] [k3b/kf5] /: Merge branch Johannes Obermay 2. 2015-11-03 [k3b/kf5] /: Merge branch 'origin/master' in Johannes Obermay