[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9a77d2: Fix incorrect patch

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 9a77d256e0ea85cf2e562bba85a4754ff486f8ae
      https://github.com/phpmyadmin/phpmyadmin/commit/9a77d256e0ea85cf2e562bba85a4754ff486f8ae
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Fix incorrect patch

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: c60ad1145bfe9a9609536f98dbf8b9e0d7edcc34
      https://github.com/phpmyadmin/phpmyadmin/commit/c60ad1145bfe9a9609536f98dbf8b9e0d7edcc34
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M libraries/insert_edit.lib.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2463fb01e651...c60ad1145bfe