[OpenImageIO/epel7: 3/3] Merge branch 'master' into epel7

[Richard Shaw]

commit e286433dd5ee978446f9352e9e8b5193c7825a7e
Merge: bb5ee46 9e58345
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Thu Jan 22 09:46:12 2015 -0600

    Merge branch 'master' into epel7

 .gitignore       |    1 +
 OpenImageIO.spec |    9 ++++++++-
 sources          |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---