[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0a15d3: Merge remote-tracking branch 'origin/master'

[Domen]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0a15d3a45e9f75ca0b6b19599a6cafa62bae4b3c
      https://github.com/phpmyadmin/phpmyadmin/commit/0a15d3a45e9f75ca0b6b19599a6cafa62bae4b3c
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 8675b384df5e5ebb740b1d1373f78de494ebe4d4
      https://github.com/phpmyadmin/phpmyadmin/commit/8675b384df5e5ebb740b1d1373f78de494ebe4d4
  Author: Victor Volkov <hanut at php-myadmin.ru>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M po/ru.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 04888099a93692eb6a5e0826685dbdf25dfd0402
      https://github.com/phpmyadmin/phpmyadmin/commit/04888099a93692eb6a5e0826685dbdf25dfd0402
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 79c574a8d055f9b3deceee7a6458d7e646f0d22c
      https://github.com/phpmyadmin/phpmyadmin/commit/79c574a8d055f9b3deceee7a6458d7e646f0d22c
  Author: Domen <dbc334 at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M po/sl.po

  Log Message:
  -----------
  Translated using Weblate.


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/779c636...79c574a