Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 63570bc30ff13d05f9e4cbdad3f8e6e05bef0584 https://github.com/phpmyadmin/phpmyadmin/commit/63570bc30ff13d05f9e4cbdad3f8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-07 (Tue, 07 Apr 2015)

Changed paths: M ChangeLog M libraries/Util.class.php

Log Message: ----------- bug #4841 Status page: Mislukte pogingen per uur value is incorrect

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 7c4d8b55e4ba0b776d078b709cc4ee5980777a79 https://github.com/phpmyadmin/phpmyadmin/commit/7c4d8b55e4ba0b776d078b709cc4... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-07 (Tue, 07 Apr 2015)

Changed paths: M ChangeLog M js/functions.js M libraries/config/messages.inc.php M po/cs.po M po/fr.po M po/it.po M po/lv.po M po/sk.po M po/tr.po

Log Message: ----------- Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 8af521f5500655eb3c452279fe122071f908ee99 https://github.com/phpmyadmin/phpmyadmin/commit/8af521f5500655eb3c452279fe12... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-07 (Tue, 07 Apr 2015)

Changed paths: M ChangeLog M libraries/Util.class.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d856682a33e...8af521f55006