[python-dtcwt] 210/497: Merge branch 'prepare-for-0.8'

[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 719d2ed1028e1e5146ef7db2e65b168ad15c225c
Merge: ea7544e 3ec0e87
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Wed Nov 13 15:50:05 2013 +0000

    Merge branch 'prepare-for-0.8'
    
    Conflicts:
    	setup.cfg
    	setup.py

 setup.cfg | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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