[python-dtcwt] 49/497: Merge branch 'master' into python3

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit 84a611ac584ff86cb8c8fd9f267d7627fa7fa7f2
Merge: cb8c5e6 b0c960f
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Wed Aug 7 23:47:03 2013 +0100

    Merge branch 'master' into python3

 .travis.yml |  2 +-
 setup.py    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


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