Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.exporter
authorMarcel Werk <burntime@woltlab.com>
Tue, 26 Nov 2013 19:18:26 +0000 (20:18 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 26 Nov 2013 19:18:26 +0000 (20:18 +0100)
commit3e2151f21a0822c784777319e8a45d60f14105ee
tree8f4c104023121faf1d1dd029101212006b69ad92
parent2d649c0ea4311df7fc4e3a72cf91684552b3e88b
parentd43acd0ed1d9570a2b25c05d62e35422314442a2
Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.exporter

Conflicts:
files/lib/system/exporter/IPB3xExporter.class.php
files/lib/system/exporter/IPB3xExporter.class.php