[Pkg-privacy-commits] [irssi-plugin-otr] 220/267: Merge branch 'upstream' into debian

[Ximin Luo]

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

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

commit b832ae52c05e9598045c350ecdf768ea30fc93b7
Merge: 1c47abb 305e7fa
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Fri May 10 09:03:52 2013 -0400

    Merge branch 'upstream' into debian

 ChangeLog        |  17 ++++++
 README.md        |   2 +-
 configure.ac     |   2 +-
 help/Makefile.am |   4 +-
 src/Makefile.am  |  12 ++--
 src/key.c        |   1 +
 src/module.c     |  27 ++++++---
 src/otr.c        | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 src/otr.h        |  28 ++++++++++
 src/utils.c      |  16 +++++-
 src/utils.h      |   1 +
 11 files changed, 240 insertions(+), 34 deletions(-)


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