[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7f977f: 4.2.7.1 release

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7f977f46335b9707fb5f7bf30d6bdb92263d2233
      https://github.com/phpmyadmin/phpmyadmin/commit/7f977f46335b9707fb5f7bf30d6bdb92263d2233
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.7.1 release

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


  Commit: 6c9d6a96be2c12a40433a26aa0209abda2cb2f8e
      https://github.com/phpmyadmin/phpmyadmin/commit/6c9d6a96be2c12a40433a26aa0209abda2cb2f8e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Log Message:
  -----------
  Merge commit '773c507' into QA_4_2


  Commit: cfc1e45510bd23a1ba8ce2ef79afcd0edd038efc
      https://github.com/phpmyadmin/phpmyadmin/commit/cfc1e45510bd23a1ba8ce2ef79afcd0edd038efc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 30ffae63cf6da5c52a96f76b16962c51526d2d56
      https://github.com/phpmyadmin/phpmyadmin/commit/30ffae63cf6da5c52a96f76b16962c51526d2d56
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/server_status_monitor.js
    M js/sql.js
    M js/tbl_chart.js
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  Merge commit '3ffc967' into QA_4_2


  Commit: e0043d959e82302329432e85056b0f528d32bfcd
      https://github.com/phpmyadmin/phpmyadmin/commit/e0043d959e82302329432e85056b0f528d32bfcd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Log Message:
  -----------
  Merge commit '7f977f4' into QA_4_2


  Commit: 052cd954ac1e20e695db97a5d2089ace4b2a5c33
      https://github.com/phpmyadmin/phpmyadmin/commit/052cd954ac1e20e695db97a5d2089ace4b2a5c33
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 47.6% (1319 of 2768)

[ci skip]


  Commit: f7be3ba54b96d0b2e54dbda1cc0fc1ba49280565
      https://github.com/phpmyadmin/phpmyadmin/commit/f7be3ba54b96d0b2e54dbda1cc0fc1ba49280565
  Author: Alecsandru Prună <alecsandrucpruna at gmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M po/ro.po

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

Currently translated at 61.5% (1704 of 2768)

[ci skip]


  Commit: 0b92a3d64df051b84d4e40d4f18c026d8901928e
      https://github.com/phpmyadmin/phpmyadmin/commit/0b92a3d64df051b84d4e40d4f18c026d8901928e
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2768 of 2768)

[ci skip]


  Commit: 03cdd61096c7108bbbd7dd0afba3ed78f39bd88b
      https://github.com/phpmyadmin/phpmyadmin/commit/03cdd61096c7108bbbd7dd0afba3ed78f39bd88b
  Author: Alex Smirnov <alex-smirnov at mail.ru>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M po/uk.po

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

Currently translated at 95.7% (2651 of 2768)

[ci skip]


  Commit: f47eaae7421c5035fb3e7084d3350cc106cf3c61
      https://github.com/phpmyadmin/phpmyadmin/commit/f47eaae7421c5035fb3e7084d3350cc106cf3c61
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/server_status_monitor.js
    M js/sql.js
    M js/tbl_chart.js
    M libraries/tbl_relation.lib.php

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


  Commit: 0927941195e2241e181dbcf3d1615f762e0d4b8b
      https://github.com/phpmyadmin/phpmyadmin/commit/0927941195e2241e181dbcf3d1615f762e0d4b8b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Log Message:
  -----------
  Merge commit 'f47eaae'


  Commit: 440fddd85e9dc11b53cdb5932d47fa9be48dfb5f
      https://github.com/phpmyadmin/phpmyadmin/commit/440fddd85e9dc11b53cdb5932d47fa9be48dfb5f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-17 (Sun, 17 Aug 2014)

  Changed paths:
    M po/el.po
    M po/ro.po
    M po/uk.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8faf31cba060...440fddd85e9d