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

[Fabian Affolter]

commit 7da1bf749e278344517d316de9da54a9e1e20414
Merge: cbbf95a e75d09f
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Feb 25 18:37:51 2012 +0100

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

 gnome-shell-extension-cpu-temperature.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gnome-shell-extension-cpu-temperature.spec
index c0c521e,0f33063..145410f
--- a/gnome-shell-extension-cpu-temperature.spec
+++ b/gnome-shell-extension-cpu-temperature.spec
@@@ -43,9 -43,9 +43,12 @@@ install -Dp -m 0644 {extension.js,metad
  
  
  %changelog
 +* Sat Feb 25 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0-0.2.gite1777e6
 +- Updated to latest upsteam version
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.4.git1f471c7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Nov 14 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0-0.2.git1f471c7
  - Updated to latest upsteam version