Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:31:19 +0000 (00:31 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 23 Jun 2015 22:31:19 +0000 (00:31 +0200)
commita646008a7c10cfd242b013e07c4a415fe399a305
treec043c705bc68a43a36a2061faabd8c04d1f36c7a
parent1896b8280ddff6932f053f5e0b8befdcb4867107
parent312b9518ddf67447bad411aa8ddd8ea68e049562
Merge branch 'master' into next
wcfsetup/install/files/js/WCF.js
wcfsetup/install/lang/de.xml