[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/telepathy-gabble/gabble-session-timeout

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    gabble-media-session.c: change default session timeout to 60 seconds