[rapid-photo-downloader: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rapid-photo-downloader

[Fabian Affolter]

commit de71ca46abea647714b8eac5746067ce2c19ecb0
Merge: fc308f2 f24f7c9
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Wed Feb 8 22:47:44 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rapid-photo-downloader
    
    Conflicts:
    	rapid-photo-downloader.spec

 rapid-photo-downloader.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rapid-photo-downloader.spec
index 11cbe14,f35c752..3589b4d
--- a/rapid-photo-downloader.spec
+++ b/rapid-photo-downloader.spec
@@@ -92,9 -90,9 +92,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 +* Wed Feb 08 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.3-1
 +- Updated to new upstream version 0.4.3
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Nov 13 2011 Fabian Affolter <mail at fabian-affolter.ch> - 0.4.2-1
  - Updated to new upstream version 0.4.2