[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-muc-presence

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix build with OLPC features enabled