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

[Orion Poplawski]

commit 57fd797ce363e2eaef0c047b6c73421bdec5ad8c
Merge: 54bcd2f 65e96c3
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Oct 2 09:45:09 2014 -0600

    Merge branch 'master' into epel7

 paraview.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---