[timblserver] 02/02: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/timblserver

[Maarten van Gompel]

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

proycon-guest pushed a commit to branch master
in repository timblserver.

commit 2646f4141edd4ba132069fa5110e78a051b4ae97
Merge: c2ca20d d3289cf
Author: proycon <proycon at anaproy.nl>
Date:   Wed Dec 6 13:03:34 2017 +0100

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/timblserver

 debian/changelog | 7 ++++++-
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


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