Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 43a4a042ceb3e5ae50313e7a7250f0513ab97e79 https://github.com/phpmyadmin/phpmyadmin/commit/43a4a042ceb3e5ae50313e7a7250... Author: Michal Čihař michal@cihar.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M ChangeLog M normalization.php

Log Message: ----------- Fixed error in 3NF step of normalization

Fixes #12121

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 686c5fe97c3386ee7899feda98304c2ecfc09679 https://github.com/phpmyadmin/phpmyadmin/commit/686c5fe97c3386ee7899feda9830... Author: Michal Čihař michal@cihar.com Date: 2016-03-25 (Fri, 25 Mar 2016)

Changed paths: M ChangeLog M normalization.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/42a852f6b33d...686c5fe97c33