Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0cc9230bd310e4fcd3b109f048a0354ee1d0a903 https://github.com/phpmyadmin/phpmyadmin/commit/0cc9230bd310e4fcd3b109f048a0... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2014-01-22 (Wed, 22 Jan 2014) Changed paths: M libraries/Config.class.php M libraries/Util.class.php Log Message: ----------- fix headers already sent warnings when using session_start() Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com> Commit: 9a9ab712bf016d1fae57121f13024dc20a2cdb4c https://github.com/phpmyadmin/phpmyadmin/commit/9a9ab712bf016d1fae57121f1302... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2014-01-22 (Wed, 22 Jan 2014) Changed paths: M libraries/Config.class.php M libraries/Util.class.php Log Message: ----------- Merge branch 'QA_4_1' Conflicts: libraries/Util.class.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f533a1f8bcc4...9a9ab712bf01