[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1868a2: Fix problem with js compressor, thanks to Atul and...

[Marc Delisle]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1868a29868e3acdb35e1acb542dcef7457db8af4
      https://github.com/phpmyadmin/phpmyadmin/commit/1868a29868e3acdb35e1acb542dcef7457db8af4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M js/server_status_monitor.js

  Log Message:
  -----------
  Fix problem with js compressor, thanks to Atul and Michal


  Commit: d2d77de3528512944b8db788d856659202a7f84b
      https://github.com/phpmyadmin/phpmyadmin/commit/d2d77de3528512944b8db788d856659202a7f84b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M js/server_status_monitor.js

  Log Message:
  -----------
  Merge branch 'MAINT_3_5_3' into QA_3_5


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/50abc1cbb33e...d2d77de35285