[Pkg-privacy-commits] [pidgin-otr] 109/255: Merge remote branch 'origin/4.0.0-beta2'

[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 df7444392aff9ccc2c7a93cfd4e6e6a837127328
Merge: d198e3f 7eb5e41
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Thu Jun 21 09:51:01 2012 -0400

    Merge remote branch 'origin/4.0.0-beta2'
    
    Conflicts:
    	ChangeLog

 ChangeLog                        | 6 ++++++
 Makefile.mingw                   | 2 +-
 NEWS                             | 6 ++++++
 configure.ac                     | 2 +-
 gtk-dialog.c                     | 8 ++++----
 otr-plugin.c                     | 4 ++--
 packaging/windows/pidgin-otr.nsi | 2 +-
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --cc ChangeLog
index a3a7512,75ee7e7..0fed175
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,9 +1,20 @@@
+ 2012-06-21
+ 
+ 	* otr-plugin.c: Fixed an issue that happened when
+ 	enabling the OTR plugin while a conversation is open.
+ 	* Release 4.0.0-beta2
+ 
 +2012-06-20
 +
 +	* po/el.po: Greek translation by <irregulator at riseup.net>
 +	* po/zh_CN.po: Simplified Chinese translation by Bisheng Liu
 +	<bisheng.liu at uwaterloo.ca>
 +
 +2012-06-16
 +
 +	* po/de.po: German translation updated by Marc Ester
 +	<marc.aurel.ester at googlemail.com>
 +
  2012-06-07
  
  	* Release 4.0.0-beta1

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