Merge remote-tracking branch 'origin/QA_3_5'

This commit is contained in:
Michal Čihař 2012-02-13 14:13:51 +01:00
commit 43e9b4dbde

View File

@ -46,6 +46,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
SourceForge phpMyAdmin project page</a></li>
<li><a href="http://wiki.phpmyadmin.net">
Official phpMyAdmin wiki</a></li>
<li><a href="https://github.com/phpmyadmin">
Git repositories on Github</a></li>
<li>Local documents:
<ul><li>Version history: <a href="changelog.php">ChangeLog</a></li>
<li>License: <a href="license.php">LICENSE</a></li>