From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 24 Mar 2013 14:36:09 +0000 (+0100)
Subject: Merge lftp configuration repository.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;ds=sidebyside;h=733df0002c03b0c503cb09b970c78a6dd54a4793;hp=733df0002c03b0c503cb09b970c78a6dd54a4793;p=config%2Fdotfiles.git

Merge lftp configuration repository.

Conflicts:
	.gitignore
	setup.sh
---