[folks] (8 commits) ...Merge branch 'folks-0-6'

[Guillaume Desmottes <gdesmott src gnome org>]

Summary of changes:

  ef9accf... eds: Add an extra timeout to the EDS tests to ensure the ma (*)
  f8f6290... Release version 0.6.9 (*)
  37aa70f... Post-release version bump (*)
  6b70bd7... eds: Donât try and remove a non-existent timeout source (*)
  a44de32... Bug 674256 â telepathy-glib minimal version is insufficie (*)
  bdc430c... Raise a debug message rather than a warning when failing to (*)
  79f7983... tpf-persona: ignore empty email or phone number (*)
  4cfb16e... Merge branch 'folks-0-6'

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