[evolution-data-server/camel-gobject] (19 commits) ...Merge branch 'master' into camel-gobject.

[Matthew Barnes <mbarnes src gnome org>]

Summary of changes:

  10bc3c4... Bug #418502 - Evolution causes gpg stale locks (*)
  4203eaa... Bug #518876 - Does not display recent messages in nntp (*)
  500e0e9... Bug #520233 - Crash in imap_body_decode at camel-imap-utils (*)
  1f17d6b... Bug #567000 - [IMAP] Renaming folder generates errors (*)
  c410ed4... Bug #570508 - Google Contacts does not display business pho (*)
  0e7f9c5... Bug #610353 - Search folder with label matches on substring (*)
  2e83205... Bug #611247 - Bad concatenation for translators (*)
  89d8d58... Implicit declaration of function 'gpg_ctx_op_cancel' on win (*)
  099e346... Bug #261087 - "Learning junk" in camel difficult to transla (*)
  f6b51eb... Bug #325121 - Do not translate developer strings in g_param (*)
  6fc6243... Bug 614388 - Broken Delete after X days behaviour (*)
  c9e5ca7... Bug #538793 - Translation issues under camel/providers/loca (*)
  9acc8ab... Lock down Camel headers. (*)
  3b924a7... Avoid C++ keywords in headers. (*)
  6759a05... Generate ChangeLog files for tarball releases. (*)
  d665f21... Merge branch 'master' into camel-gobject.
  69d4ab3... Miscellaneous cleanups.
  6b7fc62... Merge some cleanup bits from camel-gobject. (*)
  49af7be... Merge branch 'master' into camel-gobject.

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