[Pkg-privacy-commits] [irssi-plugin-otr] 219/267: Merge tag 'v1.0.0-alpha2' into upstream

[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 305e7fad5b8d1d18dddff42b864a3dfac54ffd95
Merge: 22d4e28 c4dcef9
Author: Antoine Beaupré <anarcat at koumbit.org>
Date:   Fri May 10 09:03:13 2013 -0400

    Merge tag 'v1.0.0-alpha2' into upstream
    
    Version 1.0.0-alpha2

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

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