[Pkg-privacy-commits] [pidgin-otr] 249/255: Merge tag 'upstream/4.0.1' into experimental

[Ximin Luo]

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

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 3f2b45ac25962c1511810aa4abdbe4e7c98ebeaa
Merge: cade8d9 b4eed05
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Oct 21 20:14:28 2014 +0000

    Merge tag 'upstream/4.0.1' into experimental
    
    Upstream version 4.0.1

 INSTALL        |   2 +-
 INSTALL.mingw  | 140 ++++++++++++++++++++++++++++++++++-----------------------
 Makefile.mingw |   2 +-
 NEWS           |   2 +-
 README         |   7 ++-
 dialogs.h      |   2 +-
 gtk-dialog.c   |   2 +-
 otr-plugin.c   |   4 +-
 po/nb_NO.po    |   2 +-
 9 files changed, 94 insertions(+), 69 deletions(-)

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