Merge commit '943ef2e8e4'

Conflicts:
	public/static/logos/legacy/arch-legacy-aqua-blue.png
	public/static/logos/legacy/arch-legacy-aqua-blue.svg
	public/static/logos/legacy/arch-legacy-aqua-white.png
	public/static/logos/legacy/arch-legacy-aqua-white.svg
	public/static/logos/legacy/arch-legacy-aqua.png
	public/static/logos/legacy/arch-legacy-aqua.svg
	public/static/logos/legacy/arch-legacy-blue1.png
	public/static/logos/legacy/arch-legacy-blue1.svg
	public/static/logos/legacy/arch-legacy-blue2.png
	public/static/logos/legacy/arch-legacy-blue2.svg
	public/static/logos/legacy/arch-legacy-noodle-blue.png
	public/static/logos/legacy/arch-legacy-noodle-blue.svg
	public/static/logos/legacy/arch-legacy-noodle-box.png
	public/static/logos/legacy/arch-legacy-noodle-box.svg
	public/static/logos/legacy/arch-legacy-noodle-cup.png
	public/static/logos/legacy/arch-legacy-noodle-cup.svg
	public/static/logos/legacy/arch-legacy-noodle-white.png
	public/static/logos/legacy/arch-legacy-noodle-white.svg
	public/static/logos/legacy/arch-legacy-ribbon1.png
	public/static/logos/legacy/arch-legacy-ribbon2.png
	public/static/logos/legacy/arch-legacy-ribbon3.png
	public/static/logos/legacy/arch-legacy-ribbon4.png
	public/static/logos/legacy/arch-legacy-ribbon5.png
	public/static/logos/legacy/arch-legacy-ribbon6.png
	public/static/logos/legacy/arch-legacy-wombat-lg.png
	public/static/logos/legacy/arch-legacy-wombat.png
	sitestatic/favicon.ico
	sitestatic/jquery-1.4.4.min.js
	sitestatic/jquery.tablesorter.min.js
	sitestatic/silhouette.png
	templates/base.html
	templates/devel/clock.html
	templates/packages/opensearch.xml
	visualize/static/d3.geom.min.js
	visualize/static/d3.layout.min.js
	visualize/static/d3.min.js

0 files changed, 0 insertions, 0 deletions