[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 27f616: Contest-1 BugFix #4053

[Marc Delisle]

  Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 27f616e963ce31430dc3f4b38f62669ebdac587b
      https://github.com/phpmyadmin/phpmyadmin/commit/27f616e963ce31430dc3f4b38f62669ebdac587b
  Author: Umair Khan <omerjerk at gmail.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M js/rte.js
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Contest-1 BugFix #4053

Signed-off-by: Umair Khan <omerjerk at gmail.com>


  Commit: 1db09959329cc2f1af681dec730cab4d5e4c5823
      https://github.com/phpmyadmin/phpmyadmin/commit/1db09959329cc2f1af681dec730cab4d5e4c5823
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-12 (Wed, 12 Feb 2014)

  Changed paths:
    M js/rte.js
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Merge pull request #921 from omerjerk/QA_4_1

Contest-1 BugFix #4053


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0aea14ae1d86...1db09959329c