[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-olpc1.0

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    docs/: bring olpc.xml up to date with latest Salut changes