fixed conflict with main branch

diff --cc check_postgres.pl
index 7abd140e3eb76caa2088cf9a4af2623a827efefc,06a3de8247ac62b8121ce59c16e89b1d2af4d5fc..5959177de705abf0e39dbff2ce0cb82abf5f2d93
--- 1/check_postgres.pl
--- 2/check_postgres.pl
+++ b/check_postgres.pl
@@@ -276,7 -282,8 +282,12 @@@ our %msg = 
        'txnwrap-cbig'       => q{The 'critical' value must be less than 2 billion},
        'txnwrap-wbig'       => q{The 'warning' value must be less than 2 billion},
        'unknown-error'      => q{Unknown error},
++<<<<<<< HEAD:check_postgres.pl
 +      'usage'              => qq{\nUsage: \$1 <options>\n Try "\$1 --help" for a complete list of options\n Try "\$1 --man" for the full manual\n},
++=======
+       'usage'              => qq{\nUsage: \$1 <options>\n Try "\$1 --help" for a complete list of options\n\n},
+       'username'           => q{username},
++>>>>>>> bucardo/master:check_postgres.pl
        'vac-msg'            => q{DB: $1 TABLE: $2},
        'vac-nomatch-a'      => q{No matching tables have ever been analyzed},
        'vac-nomatch-v'      => q{No matching tables have ever been vacuumed},
@@@ -8088,9 -8243,18 +8260,19 @@@ Items not specifically attributed are b
  
  =over 4
  
- =item B<?>
+ =item B<Version 2.15.0>
  
 +  Add --man option to show the entire manual. (Andy Lester)
+   Add the "pgbouncer_checksum" action (Guillaume Lelarge)
+   Fix regex to work on WIN32 for check_fsm_relations and check_fsm_pages (Luke Koops)
+   Don't apply a LIMIT when using --exclude on the bloat action (Marti Raudsepp)
+   Change the output of query_time to show pid,user,port, and address (Giles Westwood)
+   Fix to show database properly when using slony_status (Guillaume Lelarge)
+ 
+ =item B<Version 2.14.3> (March 1, 2010)
+ 
+   Allow slony_status action to handle more than one slave.
+   Use commas to separate function args in same_schema output (Robert Treat)
  
  =item B<Version 2.14.2> (February 18, 2010)