Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-03-14 13:38:49 +01:00
commit dd2a294753

View File

@ -71,7 +71,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
</li>
<li>You need GD2 support in PHP to display inline
thumbnails of JPEGs (&quot;image/jpeg: inline&quot;) with their
original aspect ratio</li>
original aspect ratio.</li>
<li>When using the &quot;cookie&quot;
<a href="#authentication_modes">authentication method</a>, the
<a href="http://www.php.net/mcrypt"><tt>mcrypt</tt></a> extension