[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3007c6: Save unfinished work

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3007c6a6ef43c48d2e1f3439f8afba90a0425250
      https://github.com/phpmyadmin/phpmyadmin/commit/3007c6a6ef43c48d2e1f3439f8afba90a0425250
  Author: Zhang Hao <jason.daurus at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M js/console.js
    M js/functions.js
    M js/sql.js
    M libraries/Console.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Save unfinished work

Signed-off-by: Zhang Hao <jason.daurus at gmail.com>


  Commit: 9ef49d83bd25aad21ec443a67114ab73aad83374
      https://github.com/phpmyadmin/phpmyadmin/commit/9ef49d83bd25aad21ec443a67114ab73aad83374
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M js/console.js
    M js/functions.js
    M js/sql.js
    M libraries/Console.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'gzzhanghao/master'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9af4514126b6...9ef49d83bd25