Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.
  etc/ftpsync-common.conf: Include Debian sources.

diff --combined etc/ftpsync-common.conf
index 5ca0c35,af89c7e..de669b9
--- 1/etc/ftpsync-common.conf
--- 2/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@@ -15,7 -15,7 +15,7 @@@
  ## CAREFUL, this directory will contain the mirror. Everything else that
  ## might have happened to be in there WILL BE GONE after the mirror sync!
  : ${LABEL="debian"}
 -: ${TO="/mnt/mirror/$LABEL/"}
 +: ${TO="/mnt/ftp/pub/mirrors/$LABEL/"}
  
  ## The upstream name of the rsync share.
  : ${RSYNC_PATH="$LABEL"}
@@@ -83,7 -83,6 +83,6 @@@
  ## want.  Crazy, no?
  ARCH_EXCLUDE=$(
        bin/debian-excludes $RSYNC_HOST $RSYNC_PATH $WANT_ARCH $SEARCH_DISTS
-       echo source
  )
  
  ## Do we have leaf mirror to signal we are done and they should sync?