Merge lftp configuration repository.

Conflicts:
	.gitignore
	setup.sh

diff --cc .gitignore
index e3dd230e16be5a92a974e66e245cb2dc22350151,b96f5b6098782bcc9e2302dc445c0c35554ee33e..42531eb38dd80ea11829a0144a7c6fe0a5ad2e83
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,4 @@@
 -# Ignore lftp log and history files.
+ /lftp/cwd_history
+ /lftp/rl_history
+ /lftp/transfer_log
 +/maxima/maxout.gnuplot_pipes

diff --cc setup.sh
index 38cac8efdf44b9df88a1613049e335b596759336,ac253c3ffcf7a09e57af569278ac380b3d05ed78..f64aa37c572a3a1b4217ae1917fea03aafbdf469
--- 1/setup.sh
--- 2/setup.sh
+++ b/setup.sh
@@@ -1,8 -1,8 +1,8 @@@
  #!/bin/sh
  
 -# Setup script for lftp configuration files.
 +# Setup script for miscellaneous configuration files.
  
- # Copyright (C) 2011-2012  Simon Ruderich
 -# Copyright (C) 2009-2013  Simon Ruderich
++# Copyright (C) 2009-2012  Simon Ruderich
  #
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -22,17 -22,6 +22,22 @@@ set -
  
  . ../lib.sh
  
 +# gdb, GNU debugger.
 +if installed gdb; then
 +    link gdbinit ~/.gdbinit
 +fi
 +
++# Powerful FTP client.
+ if installed lftp; then
+     link lftp ~/.lftp
+ fi
++
 +# Maxima, a symbolic algebra program.
 +if installed maxima; then
 +    link maxima ~/.maxima
 +fi
 +
 +# perlcritic to check Perl programs for common problems.
 +if installed perlcritic; then
 +    link perl/perlcriticrc ~/.perlcriticrc
 +fi