Merge branch 'darcs'

Conflicts:
	debian/changelog

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 8a451d386319d801b8440b50131cddea6bcdba1f..5111541e48d5865ef056018306a3a23b09d54ba5 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -120,6 +120,7 @@ sub import (@) {
                for (;;) {
                        print "Choose a password: ";
                        chomp($password=<STDIN>);
+                       print "\n";
                        print "Confirm password: ";
                        chomp($password2=<STDIN>);
 

diff --git a/debian/changelog b/debian/changelog
index 2b1f938b30fe6fb7df5a6b1b42d7236fc976df2e..bbc7e6f136df7c661740e4c34a84e27d168757f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.10) UNRELEASED; urgency=low
     - Simon Michael contributed multiple changes.
     - Petr Ročkai fixed rcs_recentchanges.
     - Sven M. Hallberg merged the above and added missing features.
+  * Add missing newline to Confirm Password prompt.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 17:47:36 -0400