Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit179cbfadc96c0c4b52078cb08faf4ede219b10d0
authorMike Hommé <mike@globalcode.org>
Tue, 8 Mar 2011 02:42:47 +0000 (7 21:42 -0500)
committerMike Hommé <mike@globalcode.org>
Tue, 8 Mar 2011 02:42:47 +0000 (7 21:42 -0500)
treea51c473155b72b1b10e70ce07cf4dad1a85872ea
parent7f5626788f226a8ce2b29390c5b1a11ad409478b
parentabb98084f8c886e056f30a9f4847728b0ba428de
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin