Merge remote-tracking branch 'spalax/paternal/upload-svg'

author Simon McVittie <smcv@debian.org>

Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)

committer Simon McVittie <smcv@debian.org>

Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)
author Simon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)
committer Simon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)
diff --cc doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
Simple merge
author	Simon McVittie <smcv@debian.org>
	Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)
committer	Simon McVittie <smcv@debian.org>
	Fri, 12 Sep 2014 20:41:45 +0000 (21:41 +0100)