[pidgin/f15] (8 commits) ...Merge branch 'f16'

[Stu Tomlinson]

Summary of changes:

  a3b018d... Rebuild against newer evolution-data-server (*)
  01a1cc5... Merge branch 'master' into f16 (*)
  b7d4192... Fix merge (*)
  b1b68c3... Rebuild against newer evolution-data-server (*)
  579702d... Rebuild against newer evolution-data-server (once again) (*)
  995ba2b... Merge branch 'master' into f16 (*)
  d68587b... Fix merge conflicts (*)
  21e4a88... Merge branch 'f16' (*)

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