Branch: refs/heads/master 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 Commit: 75f3174436841e0ca729553238a7a457ada7b46a https://github.com/phpmyadmin/phpmyadmin/commit/75f3174436841e0ca729553238a7... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7f6e42295245...75f317443684