[libotr: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libotr

[Paul Wouters]

commit 458456fc313e2a85beac7af9ea3c76eb866bd243
Merge: 758d596 d7d8a09
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Aug 8 11:27:00 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libotr
    
    Conflicts:
    	libotr.spec

 libotr.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc libotr.spec
index 79148a9,88b3e4e..f0a7190
--- a/libotr.spec
+++ b/libotr.spec
@@@ -2,7 -1,7 +2,7 @@@
  Summary: Off-The-Record Messaging library and toolkit
  Name: libotr
  Version: 3.2.0
- Release: 6%{?dist}
 -Release: 8%{?dist}
++Release: 9%{?dist}
  License: GPLv2 and LGPLv2
  Group: System Environment/Libraries
  Source0: http://otr.cypherpunks.ca/%{name}-%{version}.tar.gz
@@@ -81,10 -70,15 +81,19 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Wed Aug 08 2012 Paul Wouters <pwouters at redhat.com> - 3.2.0-6
++* Wed Aug 08 2012 Paul Wouters <pwouters at redhat.com> - 3.2.0-9
 +- Patch for Multiple heap-based buffer overflows in the Base64 decoder
 +  (rhbz#846377, upstream will not release 3.2.1 for this)
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Mon May 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 3.2.0-5
  - disable static libs
  - disable rpath