[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/tp-sofiasip-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Also update comment for bindir -> libexecdir

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move CM executable to $libexecdir, adjust .service accordingly