Merge pull request #1191 from d3vgru/master

author Eugen <eugen@zeonfederated.com>

Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)

committer GitHub <noreply@github.com>

Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)
author Eugen <eugen@zeonfederated.com>
Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)
committer GitHub <noreply@github.com>
Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)
diff --cc docs/Running-Mastodon/Production-guide.md
Simple merge
author	Eugen <eugen@zeonfederated.com>
	Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)
committer	GitHub <noreply@github.com>
	Fri, 7 Apr 2017 21:02:49 +0000 (23:02 +0200)