Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 13:59:24 +0000 (15:59 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 13:59:24 +0000 (15:59 +0200)
commit71c23273a73dc943dd1dd769e86bfb265fa5bc00
tree8b42feef3024e0ab77f39399becc2e63b759cebc
parentdd495bf5563e495c67b3791ddac91b2a76104dfc
parentd80f9d5f4d789bb7dcbc8a199196093c426b5c29
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# package.xml
language/en.xml