[cfitsio/epel7: 5/5] Merge branch 'master' into epel7

[Sergio Pascual]

commit cb8e0c2eb9634ab80e8cdbc45c81a3bbd9a8ac03
Merge: e69e0c4 5cacaf2
Author: Sergio Pascual <sergiopr at fedoraproject.org>
Date:   Fri Jun 13 15:25:17 2014 +0200

    Merge branch 'master' into epel7

 .gitignore                    |  1 +
 cfitsio-aarch64.patch         | 22 +++++++++++++++++++
 cfitsio-ppc64le_support.patch | 31 +++++++++++++++++++++++++++
 cfitsio-zlib.patch            | 50 ++++++++++++++++++++++++++++++++-----------
 cfitsio.spec                  | 24 ++++++++++++++++-----
 sources                       |  2 +-
 6 files changed, 111 insertions(+), 19 deletions(-)
---