Merge pull request #2114 from Smooey/master
authorAlexander Ebert <ebert@woltlab.com>
Tue, 11 Oct 2016 16:58:03 +0000 (18:58 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Oct 2016 16:58:03 +0000 (18:58 +0200)
commit404d9826bafd9393dfb725676f5b4629e3e9cf63
tree8cdec161bf9e984def703f9fbc1c968824e3446b
parent1a02d9d52d47d7649eb08486879dcc154881b2dc
parent2017b6a3289af404dde09dc947b0ad640f227e49
Merge pull request #2114 from Smooey/master

A couple English "bug fixes" to merge...