[mussh/el5: 8/8] Merge remote-tracking branch 'origin/master' into el5

[Kevin Fenzi]

commit 7c05ed71e36ca6583e12d38b622256224e74b2c7
Merge: ff17d0e a3a522a
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Nov 16 22:15:30 2011 -0700

    Merge remote-tracking branch 'origin/master' into el5

 .gitignore |    1 +
 mussh.spec |   20 ++++++++++++++++++++
 sources    |    2 +-
 3 files changed, 22 insertions(+), 1 deletions(-)
---
diff --cc mussh.spec
index 7e1188c,dc0df9f..c99c74f
--- a/mussh.spec
+++ b/mussh.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:           mussh
++<<<<<<< HEAD
 +Version:        0.7
 +Release:        2%{?dist}
++=======
+ Version:        1.0
+ Release:        0%{?dist}
++>>>>>>> origin/master
  Summary:        Multihost SSH wrapper
  
  Group:          Applications/System
@@@ -40,6 -40,18 +45,21 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/*
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Wed Nov 16 2011 Kevin Fenzi <kevin at scrye.com> - 1.0-0
+ - Update to new 1.0 upstream release. 
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+ 
+ * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+ 
++>>>>>>> origin/master
  * Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> 0.7-2
  - Update License tag