[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ddf78c: Re-merge b3dbec1...9207203, changes got lost on or... - Git

26 May 2014

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ddf78c212b083c11864488b07f3539ce361d3f9d
     
https://github.com/phpmyadmin/phpmyadmin/commit/ddf78c212b083c11864488b07f3…
  Author: Ann + J.M &lt;phpMyAdmin(a)ZweiSteinSoft.de&gt;
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M libraries/Advisor.class.php
    M libraries/DBQbe.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/SavedSearches.class.php
    M libraries/bookmark.lib.php
    M libraries/core.lib.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/insert_edit.lib.php
    M libraries/plugins/export/ExportJson.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportPhparray.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportYaml.class.php
    M libraries/plugins/export/PMA_ExportPdf.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php

  Log Message:
  -----------
  Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2

Signed-off-by: Ann + J.M &lt;phpMyAdmin(a)ZweiSteinSoft.de&gt;