Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitfe6611f05bd3f5b9dd774ad1a43ffaed0280be01
authorPootle server <pootle@cihar.com>
Tue, 19 Jul 2011 12:34:56 +0000 (19 14:34 +0200)
committerPootle server <pootle@cihar.com>
Tue, 19 Jul 2011 12:34:56 +0000 (19 14:34 +0200)
tree57b06e2485b064e77e81a3a9e15f0cfee1804156
parent8667d0f4a98ec44e0dda550260be545d2a8b908b
parent56f55dcaf69ee60889ba6c7fef9921daf17bc3de
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
po/da.po
po/da.po