| commit | 2a59451ac5bb593da66d8787745f5509ec8b27fc | |
| author | lorilee <leelorik@gmail.com> | |
| Mon, 26 Jul 2010 20:42:42 +0000 (26 13:42 -0700) | ||
| committer | lorilee <leelorik@gmail.com> | |
| Mon, 26 Jul 2010 20:42:42 +0000 (26 13:42 -0700) | ||
| tree | d65c29b89ce18869d366d4d304393cc82eabeb8f | treesnapshot (tar.gz zip) |
| parent | 723a71c0145f4ccb91db23f878fefa203ce71ca6 | commitdiff |
| parent | 41bc587ed4494d21e7b69647a1235d2ca405c8ea | commitdiff |
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
server_export.php
Conflicts:
server_export.php