[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/darcs/gabble-misc-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    presence.c: properly include time.h