Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4

diff --cc lib/l10n.php
index c5967109a60c8ac7c6d4c8fdef1ef0204d24adb0,868f8881ec214c75aa4471cc66fdabbef80c7433..de8514573d393a68db014dfdd7a4694f9f4e169c
--- 1/lib/l10n.php
--- 2/lib/l10n.php
+++ b/lib/l10n.php
@@@ -113,9 -92,9 +113,9 @@@ class OC_L10N
                        $i18ndir = self::findI18nDir($app);
                        // Localization is in /l10n, Texts are in $i18ndir
                        // (Just no need to define date/time format etc. twice)
 -                      if(file_exists($i18ndir.$lang.'.php')){
 +                      if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
                                // Include the file, save the data from $CONFIG
-                               include($i18ndir.$lang.'.php');
+                               include(strip_tags($i18ndir).strip_tags($lang).'.php');
                                if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
                                        $this->translations = $TRANSLATIONS;
                                }