[ATpy/f14: 2/3] Merge branch 'master' into f14

[Sergio Pascual]

commit b173eca9c94a178c61b55258bbbb457dec6e9c14
Merge: 790a1aa 342e952
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jul 15 17:10:48 2011 +0200

    Merge branch 'master' into f14

 .gitignore |    1 +
 ATpy.spec  |    6 +++---
 sources    |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --cc ATpy.spec
index 0b01206,2a62d33..e2aa705
--- a/ATpy.spec
+++ b/ATpy.spec
@@@ -90,12 -90,9 +90,12 @@@ pop
  %endif # with_python3
  
  %changelog
- * Tue May 24 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.5.1-1
- - New upstream release. Fixes crash if vo package is not present
+ * Thu Jul 14 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.5.3-1
+ - New upstream release.
  
 +* Wed May 11 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.5-2.1
 +- Disable python3, numpy missing
 +
  * Wed May 11 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.5-2
  - Moving Requires for python3 to its proper place in package macro