Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5c271667b61b51de2258cde11cbe30ab484ebdd https://github.com/phpmyadmin/phpmyadmin/commit/f5c271667b61b51de2258cde11cb... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2014-10-20 (Mon, 20 Oct 2014) Changed paths: M ChangeLog Log Message: ----------- Update ChangeLog. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 20d7e0c71ea88ef6c4cdd966005b8f3062f2bc26 https://github.com/phpmyadmin/phpmyadmin/commit/20d7e0c71ea88ef6c4cdd966005b... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2014-10-20 (Mon, 20 Oct 2014) Changed paths: M libraries/Config.class.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/270d2a0ceefe...20d7e0c71ea8