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

[Richard Shaw]

commit bb5ee462c243b6799baa3574b85ca137b289bcbd
Merge: 423fcca a476e32
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue Nov 25 07:58:50 2014 -0600

    Merge branch 'master' into epel7

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