[gnome-shell-extension-remove-volume-icon/f17: 2/2] Merge branch 'f16' into f17

[Fabian Affolter]

commit e281e05f2ea467519cd28235a93315742a734382
Merge: f0c9931 1b445d5
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Apr 13 14:26:18 2012 +0200

    Merge branch 'f16' into f17
    
    Conflicts:
    	gnome-shell-extension-remove-volume-icon.spec

 .gitignore                                    |    1 +
 gnome-shell-extension-remove-volume-icon.spec |    7 +++++--
 sources                                       |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc gnome-shell-extension-remove-volume-icon.spec
index c6bb237,0757bd7..7e7ee3c
--- a/gnome-shell-extension-remove-volume-icon.spec
+++ b/gnome-shell-extension-remove-volume-icon.spec
@@@ -40,9 -40,9 +40,12 @@@ make install DESTDIR=%{buildroot
  
  
  %changelog
+ * Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.0-1
+ - Updated to new upstream release 0.4.0
+ 
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Mon Jan 02 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.3.1-1
  - Updated to new upstream release 0.3.1