Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d578bda1009af54a8d32f11ba75f78aeddedb68b https://github.com/phpmyadmin/phpmyadmin/commit/d578bda1009af54a8d32f11ba75f... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- Clarify code for ForceSSL Conflicts: libraries/common.inc.php Commit: 6fe86fc54919ac756bc5f0ee1229671259e1f490 https://github.com/phpmyadmin/phpmyadmin/commit/6fe86fc54919ac756bc5f0ee1229... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- More clever URL rewriting with ForceSSL (bug #3510196) Commit: 2e354b7b7551ac0c310bb05666b624936e103a62 https://github.com/phpmyadmin/phpmyadmin/commit/2e354b7b7551ac0c310bb05666b6... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M ChangeLog Log Message: ----------- Document backport Compare: https://github.com/phpmyadmin/phpmyadmin/compare/20a6d3b1c6b1...2e354b7b7551