Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 09:53:25 +0000 (11:53 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 09:53:25 +0000 (11:53 +0200)
commit67c071c5e83c8173c43fafd64b605239bfbcac45
tree3f5228aa6e554fb9231730cdcf856e20377a4b2e
parent3197a210fef10516ee0b3e0a97593fbbf5985655
parente13bffe572055ec0a20e8e976c5ea32403928a18
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# files/lib/system/exporter/IPB4xExporter.class.php
# files/lib/system/exporter/WBB4xExporter.class.php
files/lib/system/exporter/IPB3xExporter.class.php
files/lib/system/exporter/IPB4xExporter.class.php