Fix: merge error in ring-connection.c
Fix: merge error in ring-connection.c

freedesktop-unofficial-mirror/telepathy__telepathy-ring,maemo-foss/meego-cellular-telepathy-ring,freedesktop-unofficial-mirror/telepathy__telepathy-ring,matthewvogt/telepathy-ring,maemo-foss/meego-cellular-telepathy-ring,freedesktop-unofficial-mirror/telepathy__telepathy-ring,jpoutiai/telepathy-ring,jpoutiai/telepathy-ring,maemo-foss/meego-cellular-telepathy-ring,matthewvogt/telepathy-ring,jpoutiai/telepathy-ring,matthewvogt/telepathy-ring