From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 26 Dec 2015 20:30:18 +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=dd003d59f56742f9374cec309ad81d527e88c846

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

dd003d59f56742f9374cec309ad81d527e88c846
diff --cc FS/FS/Conf.pm
index 72421c767,7dbc2ebf2..e066225c0
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -4321,8 -4321,8 +4321,9 @@@ and customer address. Include units.'
      'description' => 'Method for standardizing customer addresses.',
      'type'        => 'select',
      'select_hash' => [ '' => '', 
+                        'uscensus' => 'U.S. Census Bureau',
                         'usps'     => 'U.S. Postal Service',
 +                       'uscensus' => 'U.S. Census Bureau',
                         'tomtom'   => 'TomTom',
                         'melissa'  => 'Melissa WebSmart',
                       ],