Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Sun, 22 May 2016 08:21:36 +0000 (10:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 22 May 2016 08:21:36 +0000 (10:21 +0200)
commit9515d423703c91d6862dd1ab4efb561dd67d02a4
treedc0c6b55f0a3f4a028fda8258d0df4362e236cd8
parentced41de94f5b707cbf56dcb144e5fd1745dd45c1
parent1d5f9363dba9edc1f022ba0a7bc1d530514b71f5
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# CHANGELOG.md
CHANGELOG.md