[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 67d548: bug fix 4334

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 67d548fea4c60521dc223d8326c3905295a1774c
      https://github.com/phpmyadmin/phpmyadmin/commit/67d548fea4c60521dc223d8326c3905295a1774c
  Author: Sampath Liyanage <plbsam at gmail.com>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  bug fix 4334

Signed-off-by: Sampath Liyanage <plbsam at gmail.com>


  Commit: 406e722af4a7d91d26e8441ed70a47eb89c9c878
      https://github.com/phpmyadmin/phpmyadmin/commit/406e722af4a7d91d26e8441ed70a47eb89c9c878
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

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


  Commit: b9d161ac8c5bf32ef8528f4a850d493c92c046f4
      https://github.com/phpmyadmin/phpmyadmin/commit/b9d161ac8c5bf32ef8528f4a850d493c92c046f4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  Merge commit '67d548f'


  Commit: 704e87377e4f7f067a2cda3eaa0d53eff4d27311
      https://github.com/phpmyadmin/phpmyadmin/commit/704e87377e4f7f067a2cda3eaa0d53eff4d27311
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  Merge pull request #1084 from sampathLiyanage/bugfix4334

bug fix 4334


  Commit: 1e37be98cf107cf02d839a4676c3102886ebfb16
      https://github.com/phpmyadmin/phpmyadmin/commit/1e37be98cf107cf02d839a4676c3102886ebfb16
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Log Message:
  -----------
  Merge commit '704e873'


  Commit: ac63c94336e653f0650fe27241a22abaebb74149
      https://github.com/phpmyadmin/phpmyadmin/commit/ac63c94336e653f0650fe27241a22abaebb74149
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/997e5e0ddfa0...ac63c94336e6