[gnome-shell-extension-noim: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnome-shell-extension-noim

[Fabian Affolter]

commit 919b27682bc9814c57752111c9ebbad840d14792
Merge: e4830b0 5b1f820
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Apr 13 21:22:19 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnome-shell-extension-noim
    
    Conflicts:
    	gnome-shell-extension-noim.spec

 gnome-shell-extension-noim.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc gnome-shell-extension-noim.spec
index a4d0390,223f51b..9f2801a
--- a/gnome-shell-extension-noim.spec
+++ b/gnome-shell-extension-noim.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:           gnome-shell-extension-noim
  Version:        1.0
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        A gnome-shell extension for removing the name and the IM status 
  
  Group:          User Interface/Desktops
@@@ -42,8 -41,8 +42,11 @@@ install -Dp -m 0644 {extension.js,metad
  
  
  %changelog
- * Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0-2
++* Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0-3
 +- Make it work with Gnome Shell 3.4
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 -* Thu Jun 02 2011 Fabian Affolter <fabian at bernewireless.net> - 1.0-1
 +* Thu Jun 02 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.0-1
  - Initial package for Fedora