Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bf5f51bee29584c22a75ed0ec4fec7a9564b92a7
      
https://github.com/phpmyadmin/phpmyadmin/commit/bf5f51bee29584c22a75ed0ec4fec7a9564b92a7
  Author: J.M <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ChangeLog
    M libraries/Advisor.class.php
    M libraries/sysinfo.lib.php
    M server_status.php

  Log Message:
  -----------
  add support for Solaris and FreeBSD system load and memory display in server 
status


  Commit: 60de108cbdf2aa08ab404f63a0968c39857d5b41
      
https://github.com/phpmyadmin/phpmyadmin/commit/60de108cbdf2aa08ab404f63a0968c39857d5b41
  Author: مترجم حرّ <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M po/ar.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 3c69bc07f00fdbfade36778fc5cde27b56de57bf
      
https://github.com/phpmyadmin/phpmyadmin/commit/3c69bc07f00fdbfade36778fc5cde27b56de57bf
  Author: Vojislav Pavić <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M po/[email protected]

  Log Message:
  -----------
  Translated using Weblate.


  Commit: ed950a6c1cc2cbc2390ddf65df4935c74f0d2048
      
https://github.com/phpmyadmin/phpmyadmin/commit/ed950a6c1cc2cbc2390ddf65df4935c74f0d2048
  Author: Weblate <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ChangeLog
    M libraries/Advisor.class.php
    M libraries/sysinfo.lib.php
    M server_status.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5


  Commit: fed871cd6fd7d03cd8b03d792b93565fcfffd656
      
https://github.com/phpmyadmin/phpmyadmin/commit/fed871cd6fd7d03cd8b03d792b93565fcfffd656
  Author: J.M <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M libraries/sysinfo.lib.php

  Log Message:
  -----------
  fix SunOS swap calculation


  Commit: b136af32921af7767718ddeb38ee45d3a8d6f033
      
https://github.com/phpmyadmin/phpmyadmin/commit/b136af32921af7767718ddeb38ee45d3a8d6f033
  Author: J.M <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M po/ar.po
    M po/[email protected]

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


  Commit: 2fce20d69f650535325f71a15a4d8370cc993228
      
https://github.com/phpmyadmin/phpmyadmin/commit/2fce20d69f650535325f71a15a4d8370cc993228
  Author: J.M <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M js/server_status_monitor.js

  Log Message:
  -----------
  Add SunOS to status_monitor.js


  Commit: 80911671b1c028598d8d2ebc36a83fb9d67ecd08
      
https://github.com/phpmyadmin/phpmyadmin/commit/80911671b1c028598d8d2ebc36a83fb9d67ecd08
  Author: J.M <[email protected]>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/Advisor.class.php
    M libraries/sysinfo.lib.php
    M server_status.php

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

Conflicts:
        server_status.php


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0354ea06ad84...80911671b1c0
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to