[python-dtcwt] 14/17: Merge branch 'master' into prepare-for-0.11

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-dtcwt.

commit f0c3b0d31a49c2f60cb9346a50bf55c2eac03ee7
Merge: 10bd397 0b05940
Author: Rich Wareham <rich at richwareham.com>
Date:   Tue Mar 8 18:28:49 2016 +0000

    Merge branch 'master' into prepare-for-0.11

 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git