[Pkg-voip-commits] [tox] 11/11: Merge branch 'upstream'

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository tox.

commit 43aec23566993569ed1997a7abdc736e401e4a2a
Merge: 4dd50b1 aeef9d4
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Sep 28 22:55:16 2016 +0100

    Merge branch 'upstream'

 Makefile.in                                 |   4 +-
 auto_tests/Makefile.inc                     |   4 +-
 other/bootstrap_daemon/src/tox-bootstrapd.c |   4 +-
 toxav/toxav.h                               | 131 ++++++++++++++++++++++++----
 4 files changed, 119 insertions(+), 24 deletions(-)

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