Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit80260e347a2e8151c22efb126c00b731097197ad
authorMichal Čihař <mcihar@suse.cz>
Tue, 6 Sep 2011 06:24:00 +0000 (6 08:24 +0200)
committerMichal Čihař <mcihar@suse.cz>
Tue, 6 Sep 2011 06:24:00 +0000 (6 08:24 +0200)
tree7bc629dda22bf8fab460fb842fc9fc203b3f2117
parentc51188c70a00686f4e32e0ed399d03e763e73552
parent381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/planet