[Pkg-telepathy-commits] [telepathy-glib-1] 01/01: Merge remote-tracking branch 'origin/upstream' into upstream

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch upstream
in repository telepathy-glib-1.

commit 628711e37a697e9c4bf06e02417960f9d74de71a
Merge: 570a6a1 4739562
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 14 13:10:38 2014 +0100

    Merge remote-tracking branch 'origin/upstream' into upstream


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git