[jabber-roster: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/jabber-roster

[Fabian Affolter]

commit 08d4c2b3644eb5d771d45e9ecd78f44ac421d35a
Merge: cc5ef3c adf26fd
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Mon Apr 30 21:11:22 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/jabber-roster
    
    Conflicts:
    	jabber-roster.spec

 jabber-roster.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc jabber-roster.spec
index 1b74c4a,abb63a9..bd5000d
--- a/jabber-roster.spec
+++ b/jabber-roster.spec
@@@ -49,7 -49,10 +49,10 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 -* Sat Nov 26 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.1-
 +* Sat Nov 26 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.1.1-1
  - Updated to new upstream release 0.1.1
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-2