[rubygem-stomp/f22: 2/2] Merge branch 'master' into f22

[stevetraylen]

commit 716df3e6b8b4ebe60e6d5edc33fb235aa28656a4
Merge: 0d00a43 b099708
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Mar 23 14:06:31 2015 +0100

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

 rubygem-stomp.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
---