Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin... master
tree7a9d6c81bb4bbddbb375cc79cdc450a61b20dcf7
-rw-r--r-- 6 .gitignore
drwxr-xr-x - git-hooks
drwxr-xr-x - git-migration
drwxr-xr-x - website