| commit | f06363811c9887a0719827cbc012e97e3680348b | |
| author | lorilee <leelorik@gmail.com> | |
| Tue, 6 Jul 2010 17:58:17 +0000 (6 10:58 -0700) | ||
| committer | lorilee <leelorik@gmail.com> | |
| Tue, 6 Jul 2010 17:58:17 +0000 (6 10:58 -0700) | ||
| tree | acaeb017b142e4e34c053c5503190d545d3ba94e | treesnapshot (tar.gz zip) |
| parent | f1a5ae3a9febae34402436a32a73341e202cc1ac | commitdiff |
| parent | 573edc0329f779dac9ad68dcd8f20ef304f885e5 | commitdiff |
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
| libraries/config.default.php | diff1 | diff2 | blobhistory |
| libraries/display_import.lib.php | diff1 | diff2 | blobhistory |