[rapid-photo-downloader/f17: 2/2] Merge branch 'f16' into f17

[Fabian Affolter]

commit 7d52207ab64516488d8ec5932ef722685aff870c
Merge: f24f7c9 fc308f2
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Apr 6 11:58:47 2012 +0200

    Merge branch 'f16' into f17
    
    Conflicts:
    	rapid-photo-downloader.spec

 .gitignore                  |    1 +
 rapid-photo-downloader.spec |    9 +++++++--
 sources                     |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc rapid-photo-downloader.spec
index f35c752,11cbe14..3589b4d
--- a/rapid-photo-downloader.spec
+++ b/rapid-photo-downloader.spec
@@@ -90,9 -92,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