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

[Orion Poplawski]

commit c8cb4f574647ff7967ad8ed496a7f5214c0ccb6e
Merge: 72bd0d4 49cc586
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Feb 3 11:59:16 2014 -0700

    Merge branch 'master' into epel7

 hdf5.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---