[python-asciitable/el6: 2/2] Merge branch 'master' into el6

[Sergio Pascual]

commit f8d7f1957b378c2f2d862a27402e7ee7fa6a74c7
Merge: 6b52027 ac8b32d
Author: Sergio Pascual <sergio.pasra at gmail.com>
Date:   Fri Sep 30 15:38:55 2011 +0200

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

 .gitignore             |    1 +
 python-asciitable.spec |    8 +++++++-
 sources                |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc python-asciitable.spec
index 912b342,5629935..7fea170
--- a/python-asciitable.spec
+++ b/python-asciitable.spec
@@@ -104,8 -104,15 +104,14 @@@ pop
  %endif # with_python3
  
  %changelog
+ * Fri Sep 30 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.1-1
+ - New upstream version, with bugfixes
+ 
 -* Sat Jul 2 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1
 +* Wed Jul 6 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1
+ - Problem with doctest fixed upstream
+ 
+ * Sat Jul 2 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.1-1
  - New upstream version with Latex, AASTex support
 -- Patch added to fix errors in the doctests of Cds
  
  * Mon Jun 6 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6.0-2
  - Adding index.rst before importing