Fix scrolling

Signed-off-by: Marc Delisle <marc@infomarc.info>
4.2.0-rc1

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '3d6362a' into QA_4_2
4.2.1-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'fc2cd8f'
4.3.0-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
Use PMA_String class to substr multi-bytes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge pull request #1159 from Tithugues/b4380_42

phpmyadmin refuses to show tables with enums containing special data
Move ChangeLog entry and clarify it

Signed-off-by: Marc Delisle <marc@infomarc.info>
Add check when there is no #pma_navigation_tree_content

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Add check when there is no #pma_navigation_tree_content

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Merge branch 'QA_4_2'
Merge commit '6fb15d8'
Merge commit '1375652'
Merge commit 'f880e55'