[empathy] (19 commits) ...Merge branch 'message-editing-rebase'

[Danielle Madeley <daniellem src gnome org>]

Summary of changes:

  29ab54d... Add 'token' property to EmpathyMessage
  44edc9f... Add 'supersedes' property to EmpathyMessage
  a4e4407... Add edit_message() method to ChatView iface
  97efba6... Pass edited messages through to the ChatView
  0569ded... [theme-adium] wrap the messages in <span id=...> so we can 
  b87566f... [theme-adium] implement edit_message()
  6b13df7... Add a tooltip saying when the message was edited
  0498651... Add an icon to edited messages
  7d48e06... Set 'token' and 'supersedes' for events from the logger
  878a1b3... Get the original message from the logger so we can supersed
  20cb884... Set the edited icon for edited messages in the log viewer
  3884ef5... Add 'original-timestamp' to EmpathyMessage
  2d91c55... Replace tpl_text_event_dup_supersedes() with synthetic mess
  e0dd22a... Reset the chat state after receiving an edited message
  830ced1... Update for new TPL API, we now get timestamp and edit_times
  8942f52... Bump to released TPL version 0.2.10
  fa8a602... Use an enum instead of the value type to determine what kin
  4f4c33a... Only decrement unread_messages if it's not an edited messag
  6e05d6a... Merge branch 'message-editing-rebase'