Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 3 Sep 2015 08:40:48 +0000 (10:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 3 Sep 2015 08:40:48 +0000 (10:40 +0200)
commit39af137f7af4376c3ec98ab4034a6678b50ca884
treef94f49bc6d845a55a49c10312ea4b179f728fd3f
parent039ace949cd2e5140c5d34f12048a80328c04bdf
parent12e587cd8d0eadc6b7770ff92438392c1f812fae
Merge branch '2.0'

Conflicts:
package.xml