[pidgin/f14] (2 commits) ...Merge branch 'master' into f14

[Stu Tomlinson]

Summary of changes:

  c25745a... remove obsolete patch (*)
  bdebccf... Merge branch 'master' into f14

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