Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88b0f56fd1fe66337eb5d3941e7d00419c22a651 https://github.com/phpmyadmin/phpmyadmin/commit/88b0f56fd1fe66337eb5d3941e7d... Author: Marc Delisle marc@infomarc.info Date: 2012-12-12 (Wed, 12 Dec 2012)

Changed paths: M ChangeLog M libraries/rte/rte_events.lib.php

Log Message: ----------- bug #3544366 [events] Event comments not saved

Commit: 7a90141ec3374569be3840831b0d3f922054f4da https://github.com/phpmyadmin/phpmyadmin/commit/7a90141ec3374569be3840831b0d... Author: Marc Delisle marc@infomarc.info Date: 2012-12-12 (Wed, 12 Dec 2012)

Log Message: ----------- Merge branch 'QA_3_5'

Commit: da0609d1ae76c283c4f7f15454ca951be2685e6b https://github.com/phpmyadmin/phpmyadmin/commit/da0609d1ae76c283c4f7f15454ca... Author: Marc Delisle marc@infomarc.info Date: 2012-12-12 (Wed, 12 Dec 2012)

Changed paths: M ChangeLog

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/72eaf6d33895...da0609d1ae76