Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit82a1d451d1fad0164b4efde5b89a7f4f989b18ba
authorMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 17 Feb 2011 19:06:15 +0000 (18 00:36 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 17 Feb 2011 19:06:15 +0000 (18 00:36 +0530)
treef27166d13113f1e7fbfb0e81e4e3ed8507074cb8
parentbd8126735f5dce0e894f2e7e549a6322f30936ca
parent66282adec9a900d98afa910f78d97352c75d300a
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin