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

[Fabian Affolter]

commit c8a29ca619a7b5eebebd0c6c73c0ed889dae14e9
Merge: 7d56d2e 4a4c9a3
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Mon Feb 25 23:44:05 2013 +0100

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

 gnome-shell-extension-remove-volume-icon.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc gnome-shell-extension-remove-volume-icon.spec
index 47f3835,1808ae3..d13133a
--- a/gnome-shell-extension-remove-volume-icon.spec
+++ b/gnome-shell-extension-remove-volume-icon.spec
@@@ -33,10 -38,14 +33,16 @@@ make install DESTDIR=%{buildroot
  %doc AUTHORS COPYING README
  %{_datadir}/gnome-shell/extensions/%{uuid}/
  
 -
  %changelog
 +* Mon Feb 25 2013 Fabian Affolter <mail at fabian-affolter.ch> - 0.5.0-1
 +- Updated to new upstream release 0.5.0
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.0-1
  - Updated to new upstream release 0.4.0