Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 14:00:01 +0000 (16:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jun 2016 14:00:01 +0000 (16:00 +0200)
commit998f1e754ea0f839d18e85a40069e0ba497c261c
treee0af6358150159321ace3223b193b9ecdd3da581
parent9a3ed3f799aa3dbffc5c5fb0aa9523633e25c9f9
parent606665477df60569695988bdd6ab2e378d518586
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# package.xml
files/lib/system/exporter/IPB4xExporter.class.php