[freeside-commits] branch master updated. 0ce1f788031c5eaac0c620add539730dd87e3113

[Ivan]

The branch, master has been updated
       via  0ce1f788031c5eaac0c620add539730dd87e3113 (commit)
       via  2b28bba3d0579766f9778ea5e804fc4e7cd1c4b3 (commit)
      from  0c72c2bf6a4f6e77fc7bea698b428a66febcae79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ce1f788031c5eaac0c620add539730dd87e3113
Merge: 2b28bba 0c72c2b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jul 26 13:52:28 2014 -0700

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


commit 2b28bba3d0579766f9778ea5e804fc4e7cd1c4b3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jul 26 13:52:04 2014 -0700

    spelling

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 41b6d24..5813332 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1114,7 +1114,7 @@ sub reason_type_options {
   {
     'key'         => 'unapplycredits',
     'section'     => 'deprecated',
-    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to nable "unapplication" of unclosed credits.',
+    'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable "unapplication" of unclosed credits.',
     'type'        => 'checkbox',
   },
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)