Merge branch 'master' into debian

Conflicts:
	AUTHORS
	ChangeLog
	handlers/maildir.in
	handlers/mysql.in
	handlers/rsync.in
	handlers/sys.helper.in
	handlers/sys.in
	src/backupninja.in

1 files changed, 13 insertions, 12 deletions

diff --git a/handlers/pgsql.helper.in b/handlers/pgsql.helper.in
index 8024616..ff1cfd4 100644
--- a/handlers/pgsql.helper.in
+++ b/handlers/pgsql.helper.in
@@ -1,4 +1,5 @@
 # -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
+# vim: set filetype=sh sw=3 sts=3 expandtab autoindent:
 
 HELPERS="$HELPERS pgsql:postgresql_database_backup"
 
@@ -13,20 +14,20 @@ do_pgsql_databases() {
    while [ -z "$REPLY" ]; do
       formBegin "$pgsql_title: databases"
          formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
-	 formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
+         formItem "Database:"
       formDisplay
       [ $? = 0 ] || return 1
       pgsql_databases="databases = "
       for i in $REPLY; do
-	 [ -n "$i" ] && pgsql_databases="$pgsql_databases $i"
+         [ -n "$i" ] && pgsql_databases="$pgsql_databases $i"
       done
    done
 }
@@ -86,14 +87,14 @@ EOF
 $pgsql_backupdir
 
 # databases = < all | db1 db2 db3 > (default = all)
-# which databases to backup. should either be the word 'all' or a 
+# which databases to backup. should either be the word 'all' or a
 # space separated list of database names.
 # Note: when using 'all', pg_dumpall is used instead of pg_dump, which means
 # that cluster-wide data (such as users and groups) are saved.
 $pgsql_databases
 
 # compress = < yes | no > (default = yes)
-# if yes, compress the pg_dump/pg_dumpall output. 
+# if yes, compress the pg_dump/pg_dumpall output.
 $pgsql_compress
 
 ### You can also set the following variables in backupninja.conf: