Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit1fb01bc42068ddf020ee8695a33319bb6d8fbe6d
authorMichal Čihař <mcihar@novell.com>
Fri, 2 Apr 2010 11:57:59 +0000 (2 13:57 +0200)
committerMichal Čihař <mcihar@novell.com>
Fri, 2 Apr 2010 11:57:59 +0000 (2 13:57 +0200)
tree6addc4956f31474ff239da616555d760bc2599c7
parentbb9897aa91efbc3d40018b0596d65c0e7d46a90d
parentc9b86a7dfa0f5b334115a57fdfeaf2bbe23d1416
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin