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

[Dominik Mierzejewski]

commit 95c4ac6b0532c99b15dde5f8feaed33493bfbde9
Merge: 7e76312 3cbd366
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Sep 4 21:49:28 2012 +0200

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

 libgadu.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc libgadu.spec
index 414757a,7004c28..ef09f4b
--- a/libgadu.spec
+++ b/libgadu.spec
@@@ -94,11 -99,12 +94,17 @@@ rm -rf $RPM_BUILD_ROO
  %doc docs/protocol.html docs/html
  
  %changelog
 +* Tue Sep 04 2012 Dominik Mierzejewski <rpm at greysector.net> 1.11.2-1
 +- updated to 1.11.2 (bug 782047)
 +- dropped obsolete patch
 +- fix build (Dan Winship, bug 851676)
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0-2.2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0-2.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Jul 12 2011 Dominik Mierzejewski <rpm at greysector.net> 1.11.0-2
  - fixed TLS usage via gnutls (rhbz #718619)