[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2cbcf7: Simplify require SSL

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2cbcf730fe71c246419cebd87c931a1559a9a925
      https://github.com/phpmyadmin/phpmyadmin/commit/2cbcf730fe71c246419cebd87c931a1559a9a925
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Simplify require SSL

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 53277f8b670758c32f5eee5794f32852f653298a
      https://github.com/phpmyadmin/phpmyadmin/commit/53277f8b670758c32f5eee5794f32852f653298a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Merge branch 'ssl'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/595d473d41a8...53277f8b6707