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

[Sergio Pascual]

commit e11c0c1f0c073312390b6fc7e9aa48d96b233bdb
Merge: 58f2f25 d6096f1
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Mon May 21 13:30:42 2012 +0200

    Merge branch 'master' into el6

 .gitignore |    1 +
 ATpy.spec  |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --cc ATpy.spec
index 8fda675,70ed012..664264d
--- a/ATpy.spec
+++ b/ATpy.spec
@@@ -88,9 -90,14 +88,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.
 +- New upstream release
 +- defattr macro removed
  
  * 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