[evolution/webkit-composer] (41 commits) ...Merge branch 'master' into webkit-composer

[Dan VrÃtil <dvratil src gnome org>]

Summary of changes:

  4bcc922... Updated Marathi Translations (*)
  5d59b5c... Updated Marathi Translations (*)
  51fe71b... User Docs: Link to Network section of Desktop Help (*)
  ae68fa9... em_migrate_session_new(): Provide a user cache directory. (*)
  c17e5b8... migrate_mbox_to_maildir(): Fix a reference counting error. (*)
  d783fee... EMailSession: Minor code rearrangement. (*)
  43917f0... Remove some unused code from EMailReader (*)
  92a2ca0... Bug #676785 - Enables wrong calendar after saving appointme (*)
  d536301... EDayView: Hide tooltip on context menu popup (*)
  208a55d... Updated Spanish translation (*)
  2ba06f6... Bug #680786 - [text-highlight] Prefer Content-Type header o (*)
  05c0d37... Bug #681432 - Runtime warnings from e_mail_display_reload() (*)
  6f7c3dd... backup-restore: Add version info to evolution.dirs file. (*)
  ee5671f... Run mbox-to-Maildir conversion before loading modules. (*)
  5e5cdaf... Avoid using uninitialized variable in e_mail_folder_expunge (*)
  6a791bb... e-convert-local-mail.c: Minor cleanups. (*)
  e8e4661... Remove the settings capplet. (*)
  40187cd... Add missing linker flag. (*)
  fc30659... express: Remove clutter-based email tabs. (*)
  67135c3... Bug 681641 - Port to new documentation infrastructure (*)
  91b7fd6... Update git.mk. (*)
  6f451f9... prefer-plain: Cleanups. (*)
  b1ae9e5... prefer-plain: Unref objects in dispose(), not finalize(). (*)
  6456e81... Adapt to CamelSession forward_to() changes. (*)
  6be2668... Adapt to CamelSession API changes. (*)
  cfc8ef4... Adapt to CamelService API changes. (*)
  be173ae... Updated Spanish translation (*)
  e41f778... Remove GroupWise specific code from itip-formatter (*)
  ff88d1f... Bug 681321 - Support both old and new-buf libxml2 APIs (*)
  3aa74eb... Updated Galician translations (*)
  cbf5173... Add e_mail_session_append_to_local_folder(). (*)
  e68fb2b... Fix a wrong translation (*)
  582ba50... Bug 681882 - Account signature not selected in new composer (*)
  5ef1922... User Docs: Initial rewrite of HTML Composer settings (*)
  94ca0b0... User Docs: Finally split formatting options into Plain Text (*)
  97d83ee... User Docs: Add hint about dconf-editor (*)
  83db23b... User Docs: Describe handling localized Re: prefixes. Fixes  (*)
  1bc6544... User Docs: Document Global Search in Calendar. Fixes bug #6 (*)
  75075d7... Updated Spanish translation (*)
  29ba074... Updated Spanish translation (*)
  a6bdf0b... Merge branch 'master' into webkit-composer

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