[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 19f153: Fixed error in PR : 11569

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 19f1536a1c0eaa7b4280bb0a0840ce01614e656c
      https://github.com/phpmyadmin/phpmyadmin/commit/19f1536a1c0eaa7b4280bb0a0840ce01614e656c
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-10-16 (Fri, 16 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Fixed error in PR : 11569

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: b0f8d1df21ffddc29d6080a0a43afa049442e04f
      https://github.com/phpmyadmin/phpmyadmin/commit/b0f8d1df21ffddc29d6080a0a43afa049442e04f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Merge pull request #11570 from devenbansod/fix_error_in_11569

Fixed error in PR : 11569


  Commit: 1a0a484baa5eaaaf4ecb5c9bd5ce89386d855251
      https://github.com/phpmyadmin/phpmyadmin/commit/1a0a484baa5eaaaf4ecb5c9bd5ce89386d855251
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: 92dd9c40e71f7db71b35fac77bb0748ff4c26b04
      https://github.com/phpmyadmin/phpmyadmin/commit/92dd9c40e71f7db71b35fac77bb0748ff4c26b04
  Author: Stefano Martinelli <stefano.ste.martinelli at gmail.com>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M po/it.po

  Log Message:
  -----------
  Translated using Weblate (Italian)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: 6fa16f81ed38bd425c2792525dcd60d16e7f6f79
      https://github.com/phpmyadmin/phpmyadmin/commit/6fa16f81ed38bd425c2792525dcd60d16e7f6f79
  Author: Weblate <noreply at weblate.org>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5


  Commit: da5e605ba747edb05ea8d001637c9a71005e62f8
      https://github.com/phpmyadmin/phpmyadmin/commit/da5e605ba747edb05ea8d001637c9a71005e62f8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Changed paths:
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_display_change_password_test.php
    M user_password.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: baad40c3b5ff897d7bada23508ccbf94f0c6b9af
      https://github.com/phpmyadmin/phpmyadmin/commit/baad40c3b5ff897d7bada23508ccbf94f0c6b9af
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-15 (Thu, 15 Oct 2015)

  Log Message:
  -----------
  Merge commit '6fa16f8'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/57e52527c8bf...baad40c3b5ff