[freemind/f17: 2/2] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/freemind into f17

[hannes]

commit 1a20fada7b119fb1f7df2cdd74ed677e4ecbc630
Merge: 1bfd521 f446018
Author: hannes <hannes at fedoraproject.org>
Date:   Thu Dec 27 18:37:27 2012 +0100

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/freemind into f17
    
    Conflicts:
    	freemind.spec

 freemind.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc freemind.spec
index 1238858,09fc1e4..2f01a82
--- a/freemind.spec
+++ b/freemind.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name: freemind		
  Version: 0.9.0
--Release:	10%{?dist}
++Release:	11%{?dist}
  Summary:	Free mind mapping software	
  
  Group:	Applications/Productivity
@@@ -260,9 -260,9 +260,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
- * Thu Dec 27 2012 Johannes Lips <hannes at fedoraproject.org> 0.9.0-10
++* Thu Dec 27 2012 Johannes Lips <hannes at fedoraproject.org> 0.9.0-11
 +- fixed the freemind.xml to fix bug #890360
 +
+ * Sun May 06 2012 Johannes Lips <hannes at fedoraproject.org> 0.9.0-10
+ - bumped the jibx version in the spec due to jibx update 
+ 
  * Fri Mar 30 2012 Johannes Lips <hannes at fedoraproject.org> 0.9.0-9
  - fixed the startup script to find all necessary files
  - fixes bug #800769