[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unnecessary rule from data/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add INSTALL to _boring

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use slightly nicer sed syntax in data/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add comments explaining why the .service.in file has a shorter name than you might expect