[kopete/f20] (3 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  6c3ca66... 14.12.2 (*)
  e7a5ba4... 14.12.3 (*)
  97b35f0... Merge branch 'master' into f20

(*) This commit already existed in another branch; no separate mail sent