[ATpy/el5: 3/4] Merge branch 'master' into el5

[Sergio Pascual]

commit f96b0a42865a1fc31ba70164c1206ed7e9e89b8d
Merge: 37dfecb d6096f1
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Mon May 21 15:43:16 2012 +0200

    Merge branch 'master' into el5

 .gitignore |    1 +
 ATpy.spec  |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc ATpy.spec
index 60da9bf,70ed012..f0533e9
--- a/ATpy.spec
+++ b/ATpy.spec
@@@ -91,9 -90,14 +91,15 @@@ pop
  %endif # with_python3
  
  %changelog
+ * Mon May 21 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.6-1
+ - New upstream release.
+ 
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Jul 14 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.9.5.3-1
  - New upstream release.
 +- Removing defattr macro
  
  * 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