Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 347dc70c18aa4d036821db3ea379068b338952d8 https://github.com/phpmyadmin/phpmyadmin/commit/347dc70c18aa4d036821db3ea379... Author: Marc Delisle marc@infomarc.info Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths: M ChangeLog M doc/config.rst

Log Message: ----------- bug #4908 Reverse proxy: infinite internal redirect (added warning in doc)

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 8c4eab13ea68a4cc8bd79e57e509122616cb1bbe https://github.com/phpmyadmin/phpmyadmin/commit/8c4eab13ea68a4cc8bd79e57e509... Author: Marc Delisle marc@infomarc.info Date: 2015-06-02 (Tue, 02 Jun 2015)

Changed paths: M ChangeLog M doc/config.rst

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cdb1fc1f68e6...8c4eab13ea68