[rednotebook/el6: 5/5] Merge branch 'f16' into el6

[Fabian Affolter]

commit 8c4a5441951af9b28c5e8e55d45b445eb7cc6dcb
Merge: 63fa315 9bf89f6
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Apr 13 20:04:25 2012 +0200

    Merge branch 'f16' into el6
    
    Conflicts:
    	rednotebook.spec

 .gitignore       |    2 ++
 rednotebook.spec |   15 ++++++++++++---
 sources          |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --cc rednotebook.spec
index 257b2cf,95f9e7e..8e8b37e
--- a/rednotebook.spec
+++ b/rednotebook.spec
@@@ -92,9 -92,15 +92,18 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
+ * Fri Apr 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.4.0-1
+ - Updated to new upstream version 1.4.0
+ 
+ * Fri Feb 10 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.3.0-1
+ - Updated to new upstream version 1.3.0
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
 +* Mon Nov 08 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.0-2
 +- Spec file synced with master branch
 +
  * Thu Oct 06 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.2.0-1
  - Update to 1.2.0