Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c1c50b59441e60c2b2e2c4872e255162400c493b
      
https://github.com/phpmyadmin/phpmyadmin/commit/c1c50b59441e60c2b2e2c4872e255162400c493b
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Revert e8fa9e533565e, ea0ad9d41c1726 and f36fbfd4c6fde

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


  Commit: 212a7e5a7e249f18c6c4daa56be801edc176d789
      
https://github.com/phpmyadmin/phpmyadmin/commit/212a7e5a7e249f18c6c4daa56be801edc176d789
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fix bug #4245

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


  Commit: cdd53ace21bbd107283bddedb8fc9368682ebeed
      
https://github.com/phpmyadmin/phpmyadmin/commit/cdd53ace21bbd107283bddedb8fc9368682ebeed
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_1'

Conflicts:
        libraries/Util.class.php
        test/libraries/PMA_insert_edit_test.php


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/47e44e519dd2...cdd53ace21bb
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable 
security intelligence. It gives you real-time visual feedback on key
security issues and trends.  Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to