[frepple/f13/master: 7/7] Merge branch 'master' into f13

[Johan De Taeye]

commit 3371061e64a26ea427600716088ad2b22d2f47de
Merge: ab562bf 5e89777
Author: johan <Johan at frepple.(none)>
Date:   Sat Sep 18 11:10:27 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	frepple.spec
    	sources

 frepple.spec |   14 +++++++++-----
 sources      |    2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc frepple.spec
index d2a814d,5dd921a..76052d3
--- a/frepple.spec
+++ b/frepple.spec
@@@ -111,9 -112,15 +112,12 @@@ rm -rf %{buildroot
  
  %files doc
  %defattr(-,root,root,-)
- %doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp
+ %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
+ * Sat Sep 18 2010 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.8.1-1
+ - New upstream release
+ 
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.8.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Sun Mar 21 2010 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.8.0-1
  - New upstream release