[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ec3ec7: Align

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ec3ec7d13b3df63ee9210b2d0973f9842abc05ef
      https://github.com/phpmyadmin/phpmyadmin/commit/ec3ec7d13b3df63ee9210b2d0973f9842abc05ef
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M config.sample.inc.php

  Log Message:
  -----------
  Align

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: ded8fd52c21241da9080558f45c32ec992bd1f28
      https://github.com/phpmyadmin/phpmyadmin/commit/ded8fd52c21241da9080558f45c32ec992bd1f28
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M doc/credits.rst
    M js/config.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/makegrid.js
    M js/navigation.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/tbl_chart.js
    M js/tbl_relation.js
    M js/tbl_select.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M po/et.po

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


  Commit: 43ec83fbdaa1925a89ce9f187d1e8577593a4899
      https://github.com/phpmyadmin/phpmyadmin/commit/43ec83fbdaa1925a89ce9f187d1e8577593a4899
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  bug #4259 reCaptcha sound session expired problem

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: f96841ebf4483065fdaecab4d516efabf688def2
      https://github.com/phpmyadmin/phpmyadmin/commit/f96841ebf4483065fdaecab4d516efabf688def2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Merge branch 'QA_4_2'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b9996c565705...f96841ebf448