Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6c4cca7766882d023ce1436733531a25a27947a4 https://github.com/phpmyadmin/phpmyadmin/commit/6c4cca7766882d023ce143673353... Author: Michal Čihař michal@cihar.com Date: 2014-05-30 (Fri, 30 May 2014)

Changed paths: M doc/_ext/configext.py

Log Message: ----------- Do not try to localize sphinx extension

- we do not (and can not) translate this anyway - causes problems with older Sphinx versions

Signed-off-by: Michal Čihař michal@cihar.com

Commit: d515cc4ca0bfe4ffbf7df7fae56ea5d187967485 https://github.com/phpmyadmin/phpmyadmin/commit/d515cc4ca0bfe4ffbf7df7fae56e... Author: Michal Čihař michal@cihar.com Date: 2014-05-30 (Fri, 30 May 2014)

Changed paths: M doc/_ext/configext.py

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b853ce1df863...d515cc4ca0bf