[rubygem-stomp/epel7: 8/8] Merge branch 'master' into epel7

[stevetraylen]

commit 1d2dba156bddc44abc11b65db8eeb45d0eff93aa
Merge: ce70867 6506913
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Mar 23 13:06:38 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	rubygem-stomp.spec

 rubygem-stomp.spec               | 16 +++++-----
 stomp-1.3.4-stub-deprecate.patch | 68 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)
---