[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 903c95: Redo 28b669a1aa3f

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 903c951bc01425b792eb9107cbee208164a4b23c
      https://github.com/phpmyadmin/phpmyadmin/commit/903c951bc01425b792eb9107cbee208164a4b23c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/engines/binlog.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/merge.lib.php
    M libraries/engines/mrg_myisam.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php

  Log Message:
  -----------
  Redo 28b669a1aa3f


  Commit: e00f7289595c016fd213f3dcb31b604a91f4082c
      https://github.com/phpmyadmin/phpmyadmin/commit/e00f7289595c016fd213f3dcb31b604a91f4082c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M build.xml
    M changelog.php
    M db_tracking.php
    M doc/config.rst
    M index.php
    M js/ajax.js
    M js/cross_framing_protection.js
    M js/export.js
    M js/keyhandler.js
    M js/navigation.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/sql.js
    M js/tbl_chart.js
    M js/tbl_find_replace.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Menu.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/display_create_table.lib.php
    M libraries/display_structure.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/operations.lib.php
    M libraries/schema/User_Schema.class.php
    M libraries/server_bin_log.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.po
    M po/ko.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    A scripts/revision-info
    M setup/scripts.js
    M tbl_tracking.php
    M test/libraries/PMA_charset_conversion_test.php
    M test/libraries/PMA_mime_test.php

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


  Commit: dd9441dd12ef2881954983520c4c9acbed05028d
      https://github.com/phpmyadmin/phpmyadmin/commit/dd9441dd12ef2881954983520c4c9acbed05028d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/79fd455ce34c...dd9441dd12ef