[Pkg-privacy-commits] [irssi-plugin-otr] 10/18: Merge remote-tracking branch 'tronic/master'

[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 bd0e3bf93c8a748d1c8447375ce78f17e5521024
Merge: 4ad3b7b 565e760
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Fri Mar 25 12:58:47 2016 -0400

    Merge remote-tracking branch 'tronic/master'

 src/module.c |  1 +
 src/otr.c    |  3 +++
 src/otr.h    |  4 ++++
 src/utils.c  | 19 +++++++++++++++++++
 src/utils.h  |  1 +
 5 files changed, 28 insertions(+)


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