[thrift/epel7: 7/7] Merge branch 'master' into epel7

[Lubomir Rintel]

commit 01edc751bec4b97fa7c0cfdec56c37879e07edf5
Merge: 2b586e4 c4ec814
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Mon May 5 11:43:49 2014 +0200

    Merge branch 'master' into epel7
    
    Conflicts:
    	thrift.spec

 thrift.spec |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---