[Pkg-telepathy-commits] [telepathy-gabble] 29/33: Merge branch 'upstream' into debian

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository telepathy-gabble.

commit 2e111dcb56bbbc7b7e896b022c3ab5fb812c2082
Merge: bf84cc4 7379140
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Aug 9 16:56:28 2013 +0100

    Merge branch 'upstream' into debian


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