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

[Jan Kaluža]

commit 06cc6639459c65449b8ea9a471ea18b6803bf8d3
Merge: cd3fec8 b4c5114
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Jul 23 10:55:55 2012 +0200

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

 swift.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc swift.spec
index 026f5f9,0579e25..4c24539
--- a/swift.spec
+++ b/swift.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: XMPP client
  Name: swift
  Version: 1.0
- Release: 8%{?dist}
 -Release: 9%{?dist}
++Release: 10%{?dist}
  Group: Applications/Internet
  License: GPLv3
  # The source for this package was pulled from upstream's vcs.  Use the
@@@ -91,9 -89,12 +91,15 @@@ desktop-file-install 
  %{_datadir}/pixmaps/%{name}.xpm
  
  %changelog
- * Mon Jul 23 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-8
++* Mon Jul 23 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-10
 +- fixed boost::TIME_UTC macro expansion
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-8
+ - Rebuilt for c++ ABI breakage
+ 
  * Tue Jan 10 2012 Jan Kaluza <jkaluza at redhat.com> - 1.0-7
  - fix building in rawhide