Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit3499d8f79b1bcfbc00b8e1218b16069cde20cacd
authorPootle server <pootle@cihar.com>
Mon, 8 Aug 2011 08:06:23 +0000 (8 10:06 +0200)
committerPootle server <pootle@cihar.com>
Mon, 8 Aug 2011 08:06:23 +0000 (8 10:06 +0200)
treeab3fe7e28e1e84999cc1af453da80febd4435875
parent9a04278d17e6fdfeb75caa7093a21c135d2a8061
parent38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin