Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin... master
commited918c070be2191a0ac60174d6305fc76d1fd841
authorlorilee <leelorik@gmail.com>
Sat, 14 Aug 2010 21:39:59 +0000 (14 14:39 -0700)
committerlorilee <leelorik@gmail.com>
Sat, 14 Aug 2010 21:39:59 +0000 (14 14:39 -0700)
treea791a1862fc0076f642b9a3a1b5d4d331c686525
parent6f833918e9ba9faaddf12a8aa60f2dfb6fe5036b
parentb51a217c36b45194f79915992a599338b3bac9ef
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin