[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 821a13: Merge branch 'MAINT_4_0_4' into QA_4_0