From: Ludovic CHEVALIER Date: Thu, 12 Jan 2012 06:16:29 +0000 (+0100) Subject: Merge branch 'master' into en_3_modeles X-Git-Tag: v0.5~30 X-Git-Url: http://git.cyclocoop.org/%40%20%27entree_url%27%20=%3E%20%27URL%20of%20your%20site%27%2C%20%27entree_url_2%27%20=%3E%20%27Site%20URL%27%2C%20%27erreur_connect_deja_existant%27%20=%3E%20%27There%20is%20already%20a%20server%20with%20that%20name%20%27%2C%20%27erreur_email_deja_existant%27%20=%3E%20%27This%20email%20address%20is%20already%20registered.%27%2C%20%27erreur_nom_connect_incorrect%27%20=%3E%20%27Server%20name%20not%20allowed%27%2C%20%27erreur_plugin_desinstalation_echouee%27%20=%3E%20%27Uninstallation%20of%20the%20plugin%20failed.%20However%2C%20you%20may%20deactivate%20it.%27%2C%20%27erreur_plugin_fichier_absent%27%20=%3E%20%27File%20missing%27%2C%40%40%20-198%2C16%20%20170%2C12%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=f5dcbf8186bf2e901655f14180ed96b72da5cf5d;p=lhc%2Fweb%2Fspip_carte_de_sites.git Merge branch 'master' into en_3_modeles --- f5dcbf8186bf2e901655f14180ed96b72da5cf5d