Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 Jan 2016 12:39:38 +0000 (13:39 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 Jan 2016 12:39:38 +0000 (13:39 +0100)
commit061187279d5f1586680de8555c757bc6e077cc2e
tree0ac3d40122d09034550eda6f4f1ab40d1169e56d
parent54267c041706ae3b34ab8c55d625ccd5bee1f160
parent3f54e80671a5a35653780b6a08fa36332979da67
Merge branch 'master' into next
wcfsetup/install/lang/de.xml