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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0f94f8f..1bb6dcc 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2617,7 +2617,7 @@ and customer address. Include units.',
     'type'        => 'select',
     'select_hash' => [
                        'actual_oncard' => 'Default/classic behavior: set the flag if a customer has actual previous charges on the card.',
-                      'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, irregardless of previous charges on the card.',
+                      'transaction_is_recur' => 'Set the flag if the transaction itself is recurring, regardless of previous charges on the card.',
                      ],
   },