[perl-Net-STOMP-Client/el6/master: 10/10] Merge branch 'master' into el6

[stevetraylen]

commit b476ddb7e93abcf2daf23ff71df13e3cad0f17bb
Merge: afb65a9 2b1f113
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Jan 10 20:37:36 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Net-STOMP-Client.spec
    	sources

 .gitignore                 |    2 +-
 perl-Net-STOMP-Client.spec |   11 ++++++++++-
 sources                    |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 39eb732,7d56a7b..0cd6de7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Net-STOMP-Client-0.9.2.tar.gz
 -/Net-STOMP-Client-0.9.5.tar.gz
++Net-STOMP-Client-0.9.5.tar.gz