[Pkg-privacy-commits] [irssi-plugin-otr] 16/18: Merge remote-tracking branch 'upstream/master' into debian

[Antoine Beaupré]

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

anarcat pushed a commit to branch debian
in repository irssi-plugin-otr.

commit a4ee336f632c8e3b3b909f3d1250b0ce3b0909a9
Merge: 6557b0c f75eb26
Author: Antoine Beaupré <anarcat at debian.org>
Date:   Fri Mar 25 14:31:21 2016 -0400

    Merge remote-tracking branch 'upstream/master' into debian

 README.md         | 12 +++---------
 configure.ac      |  4 ++--
 help/Makefile.am  |  2 +-
 help/otr          |  2 +-
 irssi-otr.spec.in |  2 +-
 src/Makefile.am   |  4 ++--
 src/module.c      | 11 +++++++++++
 src/otr.c         |  6 ++++++
 src/otr.h         |  5 +++++
 src/utils.c       | 22 ++++++++++++++++++++++
 src/utils.h       |  1 +
 11 files changed, 55 insertions(+), 16 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git