From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 13 Nov 2015 21:06:00 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d;hp=fb5becb1a877994b897e737e983fae2c8da6a5ac

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS/part_export/cardfortress.pm b/FS/FS/part_export/cardfortress.pm
index 154f979b0..8c9413597 100644
--- a/FS/FS/part_export/cardfortress.pm
+++ b/FS/FS/part_export/cardfortress.pm
@@ -4,6 +4,7 @@ use strict;
 use base 'FS::part_export';
 use vars qw( %info );
 use String::ShellQuote;
+use Net::OpenSSH;
 
 #tie my %options, 'Tie::IxHash';
 #;
@@ -21,8 +22,6 @@ sub rebless { shift; }
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
 
-  eval "use Net::OpenSSH;";
-  return $@ if $@;
 
   open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
   my $ssh = Net::OpenSSH->new( $self->machine,
@@ -61,9 +60,6 @@ sub _export_delete {
 
   #well, we're just going to disable them for now, but there you go
 
-  eval "use Net::OpenSSH;";
-  return $@ if $@;
-
   open my $def_in, '<', '/dev/null' or die "unable to open /dev/null";
   my $ssh = Net::OpenSSH->new( $self->machine,
                                default_stdin_fh => $def_in );
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 94a8732e5..3f80570d9 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -63,7 +63,7 @@ GmbH, licensed under the terms of the GNU GPL.
 <P>
 Latex invoice template based on a template from eBills
 <http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
-licensed under the terms fo the GNU GPL.
+licensed under the terms of the GNU GPL.
 
 <P>
 Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>