commit 59811a6635e899bdc4799ff27c07c164f92b0272
Merge: 6e91f21 2f864d5
Author: Massimo massimo.pala...@gmail.com
Date: Thu Jun 13 14:20:43 2013 +0200
Merge branch 'master' into el6
.gitignore |1 +
perl-Net-STOMP-Client.spec |8 +++-
sources
commit 1b6968491283a5d3357c093d6ef42edd8b69b811
Merge: 2872a90 6038d16
Author: Steve Traylen steve.tray...@cern.ch
Date: Wed Feb 1 22:09:52 2012 +0100
Merge branch 'master' into el6
.gitignore |1 +
perl-Net-STOMP-Client.spec | 14 +-
sources
commit 2872a90884938ad2c51feea4693d4a20d396321e
Merge: f383258 78de637
Author: Steve Traylen steve.tray...@cern.ch
Date: Thu Nov 17 00:42:32 2011 +0100
Merge branch 'master' into el6
perl-Net-STOMP-Client.spec |8 +++-
sources|2 +-
2 files changed, 8
commit f383258c9463fbac45308bc4fba7a10078e55d40
Merge: 2ef91e6 4418040
Author: Steve Traylen steve.tray...@cern.ch
Date: Wed May 11 00:05:47 2011 +0200
Merge branch 'master' into el6
Conflicts:
.gitignore
.gitignore |4 +++-
perl-Net-STOMP-Client.spec