[devscripts] 02/03: Merge branch 'starttls'

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit a222182bb8f4d7fe09891032d65888e55168d378
Merge: b909a19 ff2a05d
Author: James McCoy <jamessan at debian.org>
Date:   Sun Oct 2 23:45:47 2016 -0400

    Merge branch 'starttls'

 README         |  2 +-
 debian/control |  4 ++--
 scripts/bts.pl | 40 +++++++++++++++++++++++++---------------
 3 files changed, 28 insertions(+), 18 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git