Merge commit '91c451'

Conflicts:
	devel/views.py
	feeds.py
	local_settings.py.example
	packages/management/commands/signoff_report.py
	packages/views/flag.py
	public/views.py
	templates/404.html
	templates/base.html
	templates/devel/clock.html
	templates/devel/index.html
	templates/devel/packages.html
	templates/devel/profile.html
	templates/general_form.html
	templates/mirrors/mirror_details.html
	templates/mirrors/mirrorlist.txt
	templates/mirrors/mirrorlist_generate.html
	templates/mirrors/mirrorlist_status.txt
	templates/mirrors/mirrors.html
	templates/mirrors/status.html
	templates/news/add.html
	templates/news/delete.html
	templates/news/list.html
	templates/news/view.html
	templates/packages/details.html
	templates/packages/differences.html
	templates/packages/files.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/flaghelp.html
	templates/packages/groups.html
	templates/packages/opensearch.xml
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoff_options.html
	templates/packages/signoffs.html
	templates/packages/stale_relations.html
	templates/public/about.html
	templates/public/art.html
	templates/public/blank.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/public/keys.html
	templates/public/svn.html
	templates/public/userlist.html
	templates/registration/login.html
	templates/registration/logout.html
	templates/releng/add.html
	templates/releng/results.html
	templates/releng/thanks.html
	templates/todolists/list.html
	templates/todolists/public_list.html
	templates/todolists/todolist_confirm_delete.html
	templates/todolists/view.html
	templates/visualize/index.html
	todolists/views.py

0 files changed, 0 insertions, 0 deletions