Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 16 Apr 2016 10:18:43 +0000 (12:18 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 16 Apr 2016 10:18:43 +0000 (12:18 +0200)
commitd0f71085ced4020b6de7e212811941d9827ea7ca
tree22d6807d7ee47e43cbd70c9860e442c88d49025f
parent092f0a5744a6a565c85d1bb9936e5cff6edeb8fb
parent9b915826b6355d39ea8c02618eee8a2d210f8afa
Merge branch 'master' into next
wcfsetup/install/lang/en.xml