From: Robert S. Edmonds <edmonds@debian.org>
Date: Tue, 24 Sep 2013 23:04:29 +0000 (-0400)
Subject: Merge tag '0.25-rc3' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=618d9423912e86c01382dc84c31247e14749dda9;p=packages%2Fb%2Fbup.git

Merge tag '0.25-rc3' into debian

0.25-rc3

Conflicts:
	cmd/fuse-cmd.py
	cmd/web-cmd.py
	config/configure
	config/configure.inc
---

618d9423912e86c01382dc84c31247e14749dda9