| commit | 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 | |
| author | Herman van Rink <rink@initfour.nl> | |
| Thu, 2 Sep 2010 12:36:18 +0000 (2 14:36 +0200) | ||
| committer | Herman van Rink <rink@initfour.nl> | |
| Thu, 2 Sep 2010 12:36:18 +0000 (2 14:36 +0200) | ||
| tree | 154a4f1b30f58fefd342cc6195ddc38090581ebf | treesnapshot (tar.gz zip) |
| parent | 223d8850cf3d723487d41cb0397869be2d544c84 | commitdiff |
| parent | 00250a9f596544596e1762819c7ff6990bf3b34b | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin