Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit93d18894f130e6d85e5bf02c6b3206cc8d9bdf37
authorPootle server <pootle@cihar.com>
Mon, 23 Aug 2010 09:20:44 +0000 (23 11:20 +0200)
committerPootle server <pootle@cihar.com>
Mon, 23 Aug 2010 09:20:44 +0000 (23 11:20 +0200)
tree2e1b44a44d704159f59ceafb877f8df1e0837cdf
parent3297c50e0401bc852252e573fb602517429e8fc2
parent00c368bbc6689ee4fa7ddfa586f51bee5f641f5b
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin