Merge remote branch 'origin/debian-master' into archive-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_installer
	setup-site.conf
	templates/config.tmpl
	templates/config/mirrors.tmpl
	templates/html/homepage.tmpl

diff --cc conf/apache.conf.sed.in
Simple merge

diff --cc templates/config.tmpl
index 1500a8f245cae58fc82ccf7df7ca6165a772fc26,9d5d3eab5aca9a8390fd87e7d323829385969675..af03918735c1c93010950a3dc3df5529fe33f0e8
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -15,15 -16,15 +15,15 @@@
     ddpo_url = 'http://qa.debian.org/developer.php?login='
     src_bugs_url = bugs_url _ 'src:'
     mirror_url = 'http://ftp.debian.org/'
 -   security_mirror = 'security.debian.org'
 +   security_mirror = 'archive.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = '/changelogs/'
 +   changelogs_url = 'http://archive.debian.net/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
 -   patch_tracking_url = 'http://patch-tracker.debian.org/package'
 +#   patch_tracking_url = 'http://patch-tracker.debian.org/package'
- #   screenshots_url = 'http://screenshots.debian.net/package/'
- #   screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
+    screenshots_url = 'http://screenshots.debian.net/package/'
+    screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail-with-version/'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',

diff --cc templates/html/homepage.tmpl
Simple merge