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

[Fabian Affolter]

commit d0f346b068250fbfadc8806130059d48cfaf0c43
Merge: d05a62d c87a6e9
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Apr 13 21:10:38 2012 +0200

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

 gnome-shell-extension-noripple.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc gnome-shell-extension-noripple.spec
index e33da20,0d0b0e9..36f7ac2
--- a/gnome-shell-extension-noripple.spec
+++ b/gnome-shell-extension-noripple.spec
@@@ -42,11 -41,8 +42,11 @@@ install -Dp -m 0644 {extension.js,metad
  
  
  %changelog
 +* Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.0-2
 +- Make it work with Gnome Shell 3.4
 +
- * Fri Dec 16 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.0-1
- - 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 <mail at fabian-affolter.ch> - 1.0-1
+ * Thu Jun 02 2011 Fabian Affolter <fabian at bernewireless.net> - 1.0-1
  - Initial package for Fedora