[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dbb0ed: Include profiling scripts initially, bug#3639

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dbb0ed3e6a2d84149cb4cad76ce1f9c824f8cc02
      https://github.com/phpmyadmin/phpmyadmin/commit/dbb0ed3e6a2d84149cb4cad76ce1f9c824f8cc02
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M libraries/common.inc.php
    M sql.php

  Log Message:
  -----------
  Include profiling scripts initially, bug#3639


  Commit: 8e305b319eea8a0c045799a33d9edf2b72d1911b
      https://github.com/phpmyadmin/phpmyadmin/commit/8e305b319eea8a0c045799a33d9edf2b72d1911b
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-05-23 (Thu, 23 May 2013)

  Changed paths:
    M ChangeLog
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/plugins/export/ExportOds.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/import/ImportOds.class.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/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/zh_CN.po
    M po/zh_TW.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/114d802470e9...8e305b319eea