[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 61df52: Merge branch 'QA_4_0' of github.com:phpmyadmin/php...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 61df52ccdd5a1114784f4bbc1e0706772adcea4f
      https://github.com/phpmyadmin/phpmyadmin/commit/61df52ccdd5a1114784f4bbc1e0706772adcea4f
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/RecentTable.class.php
    M po/da.po

  Log Message:
  -----------
  Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into Bug3970

Conflicts:
	ChangeLog


  Commit: e3f0dcc423ed53eb928cc48e9b40bd5f4c4712b6
      https://github.com/phpmyadmin/phpmyadmin/commit/e3f0dcc423ed53eb928cc48e9b40bd5f4c4712b6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ChangeLog
    M js/navigation.js

  Log Message:
  -----------
  Merge pull request #424 from kasunchathuranga/Bug3970

Fix bug 3970 - Pressing enter in the filter field reloads page


  Commit: 178f83f9159dd0ff79464a35905023fe3d508097
      https://github.com/phpmyadmin/phpmyadmin/commit/178f83f9159dd0ff79464a35905023fe3d508097
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  bug #3984 Cannot insert in this table (PHP < 5.4)


  Commit: 7fb505533e64776c854a28fbe4662985ae8fff2f
      https://github.com/phpmyadmin/phpmyadmin/commit/7fb505533e64776c854a28fbe4662985ae8fff2f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Log Message:
  -----------
  Merge commit 'e3f0dcc'


  Commit: d31ba0cb0247a2648d7fa7ee66e60fd9263db324
      https://github.com/phpmyadmin/phpmyadmin/commit/d31ba0cb0247a2648d7fa7ee66e60fd9263db324
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Merge branch 'QA_4_0'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b8ab2d4bfe87...d31ba0cb0247