[perl-Net-STOMP-Client/el5: 3/3] Merge branch 'master' into el5

[stevetraylen]

commit f3fb5068ed1e017ef98aa345c2056bd895ce19fe
Merge: 444cc71 6038d16
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Feb 1 22:10:22 2012 +0100

    Merge branch 'master' into el5

 .gitignore                 |    1 +
 perl-Net-STOMP-Client.spec |   14 +++++++++++++-
 sources                    |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index c03678d,67f582c..4798a92
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -Net-STOMP-Client-0.9.2.tar.gz
  /Net-STOMP-Client-0.9.5.tar.gz
  /Net-STOMP-Client-1.0.tar.gz
+ /Net-STOMP-Client-1.4.tar.gz