[empathy/f15/master] (6 commits) ...Fix merge conflicts

[Brian Pepple]

Summary of changes:

  984558f... - Update to 2.91.90. - Bump min version for folks and tp-gl (*)
  edfc4ec... Update to 2.91.90.1. (*)
  13b7073... Update to 2.91.90.2. (*)
  acbcee2... Update to 2.91.91. Update minimum version of tp-glib & gtk3 (*)
  035cf0c... Update to 2.91.91.1. Bump min version of folks needed. (*)
  18c0d53... Fix merge conflicts

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