[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2ca793: 4.0.6-rc2

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2ca79320ee5e56525a06de8d3aaeca928d8c2056 https://github.com/phpmyadmin/phpmyadmin/commit/2ca79320ee5e56525a06de8d3aa… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-08-31 (Sat, 31 Aug 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.6-rc2 Commit: 1bab8bfeeaf508cbe5fb8ff7ed1b910b7faca3eb https://github.com/phpmyadmin/phpmyadmin/commit/1bab8bfeeaf508cbe5fb8ff7ed1… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-09-02 (Mon, 02 Sep 2013) Changed paths: M export.php Log Message: ----------- The rendering of "view output as text" should not be affected by the fix for the memory problems in export Commit: f0a0ad5eafee89231792e1590ae8f36233173e74 https://github.com/phpmyadmin/phpmyadmin/commit/f0a0ad5eafee89231792e1590ae… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-09-02 (Mon, 02 Sep 2013) Log Message: ----------- Merge commit '2ca7932' into QA_4_0 Commit: 57b241a45f3274d05c4483506cc98ff990cc6964 https://github.com/phpmyadmin/phpmyadmin/commit/57b241a45f3274d05c4483506cc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-09-02 (Mon, 02 Sep 2013) Changed paths: M export.php Log Message: ----------- Merge branch 'MAINT_4_0_6' into QA_4_0 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/72090405e932...57b241a45f32