Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit74ab7d721019108106731feeedd5f2488e84d23e
authorPootle server <pootle@cihar.com>
Mon, 6 Sep 2010 09:46:08 +0000 (6 11:46 +0200)
committerPootle server <pootle@cihar.com>
Mon, 6 Sep 2010 09:46:08 +0000 (6 11:46 +0200)
tree8810ae11771433acfd480db6c31b0e70597e6515
parent3310ffccb778ff0163f84c13cb2a73fa226a6dad
parente53a7e4d5821892cad38463198762eaf38f41e15
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin