Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b95aa6cdfddbb4e4bf0c771f692631b09a14601b https://github.com/phpmyadmin/phpmyadmin/commit/b95aa6cdfddbb4e4bf0c771f6926... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2014-06-09 (Mon, 09 Jun 2014) Changed paths: M js/functions.js Log Message: ----------- Remove trailing whitespaces. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 8295af58b592a422e950dee9961accce0c8063db https://github.com/phpmyadmin/phpmyadmin/commit/8295af58b592a422e950dee9961a... Author: Hugues Peccatte <hugues.peccatte@gmail.com> Date: 2014-06-09 (Mon, 09 Jun 2014) Changed paths: M ChangeLog Log Message: ----------- Update ChangeLog. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com> Commit: 15b5051928ffc4dd994f0c94a26c00a3f73e6fb7 https://github.com/phpmyadmin/phpmyadmin/commit/15b5051928ffc4dd994f0c94a26c... Author: Michal Čihař <michal@cihar.com> Date: 2014-06-10 (Tue, 10 Jun 2014) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 Conflicts: ChangeLog Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a6dad0aba32...15b5051928ff