[Stable9] downstream 16-06-12 - #66

Merged

LukasReschke merged 3 commits into

stable9-downstream-160612

Jun 12, 2016

Commits on Jun 10, 2016

Do not use the language name, when it's not the one from the language we want

nickvergessen
authored and
DeepDiver1975
committed
Merge pull request #25054 from owncloud/issue-24536-language-name-reused-for-fallback-languages-stable9
Vincent Petry
authored

Commits on Jun 12, 2016

Merge branch 'stable9' of https://github.com/owncloud/core into stable9-downstream-160612
blizzz
committed