Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 29 Nov 2015 11:43:12 +0000 (12:43 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 29 Nov 2015 11:43:12 +0000 (12:43 +0100)
commit94876c61a72cd2fa700b7edaac1264b4a2f058b3
tree63bc2bf56fd00320c387c4ecdb2257aa4e6d466a
parent94b0661adc8f0c53af4e3f18123a701fe4490cea
parent6ba355c89a5e38fae56bedfd5b3513d39bb31ff3
Merge branch 'master' into next
wcfsetup/install/lang/en.xml