Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-08-25 20:40:12 +02:00
commit ce2b930832

View File

@ -2835,7 +2835,7 @@ setfacl -d -m "g:www-data:rwx" tmp
minor version since the one that is bundled with some PHP distributions is
rather old and might cause problems <a href="#faq1_17a">
(see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br />
<a href="http://mariadb.org/"></a>MariaDB is also supported
<a href="http://mariadb.org/">MariaDB</a> is also supported
(versions 5.1 and 5.2 were tested).<br /><br />
Since phpMyAdmin 3.5 <a href="http://www.drizzle.org/">Drizzle</a> is supported.
</p>