[python-xlrd/el6: 12/12] Merge branch 'master' into el6

[Ján ONDREJ]

commit 55b232639c8a90fe094ed6a12e9ffbd93ed22c68
Merge: b547d23 878d5eb
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Mon Apr 29 13:13:49 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-xlrd.spec

 python-xlrd.spec |   25 ++++++++++++++-----------
 sources          |    4 +++-
 2 files changed, 17 insertions(+), 12 deletions(-)
---
diff --cc python-xlrd.spec
index 3d85877,1afdb17..8015fd6
--- a/python-xlrd.spec
+++ b/python-xlrd.spec
@@@ -56,8 -59,34 +58,12 @@@ rm -rf $RPM_BUILD_ROO
  %attr(755,root,root) %{_bindir}/*
  
  %changelog
+ * Tue Apr 23 2013 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.9.2-1
+ - Update to upstream.
+ - Updated URL and description.
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sun Oct 07 2012 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.8.0-1
 -- Update to upstream.
 -
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Mon Aug 23 2010 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.7.1-1
 -- new version
 -- fixed summary spelling
 -- fixed egg-info condition
 -- fixed source URL for new version
 -
 -* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.1-10
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +* Thu Jul 01 2010 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-10
 +- Removed Fedora < 9 support
  
  * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-9
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild