[frepple/f14: 5/5] Merge branch 'master' into f14

[Johan De Taeye]

commit a3b073f4de8f68afcc2a8a79b8c70d8c4c5923e0
Merge: c06060b 74dbb59
Author: johan <johan at freckle2.mcasolutions.com>
Date:   Sun Oct 30 12:46:56 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	frepple.spec

 .gitignore   |    4 +++-
 frepple.spec |   13 ++++++++-----
 sources      |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --cc frepple.spec
index 08e8090,50cc08a..213d336
--- a/frepple.spec
+++ b/frepple.spec
@@@ -115,7 -115,16 +115,10 @@@ rm -rf %{buildroot
  %doc doc/reference doc/Frepple doc/UI doc/Main doc/Tutorial doc/uploads doc/uploads/Frepple doc/uploads/UI doc/uploads/Tutorial doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp
  
  %changelog
+ * Sun Oct 30 2011 Johan De Taeye <jdetaeye at users.sourceforge.net> - 0.9.0-1
+ - New upstream release
+ 
 -* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 0.8.1-4
 -- Rebuilt with xerces-c 3.1
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Wed Sep 29 2010 jkeating - 0.8.1-2
 +* Wed Sep 29 2010 jkeating - 0.8.1-1.1
  - Rebuilt for gcc bug 634757
  
  * Sat Sep 18 2010 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.8.1-1