Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af46efa5ed33f9c8db0da45906f8add07b90f0dc https://github.com/phpmyadmin/phpmyadmin/commit/af46efa5ed33f9c8db0da45906f8... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)

Changed paths: M libraries/insert_edit.lib.php

Log Message: ----------- If a TIMESTAMP contains a NULL value, show it when inserting or editing

Commit: 7de49938b042d4a9b73c7a1a71bfb0df5576e45e https://github.com/phpmyadmin/phpmyadmin/commit/7de49938b042d4a9b73c7a1a71bf... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)

Changed paths: M libraries/Table.class.php

Log Message: ----------- Function forgot to return its result

Commit: 24fc4f5d537790515104ee2a206fc3a5ad26d176 https://github.com/phpmyadmin/phpmyadmin/commit/24fc4f5d537790515104ee2a206f... Author: Marc Delisle marc@infomarc.info Date: 2013-05-31 (Fri, 31 May 2013)

Changed paths: M libraries/Table.class.php M libraries/insert_edit.lib.php

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/adddd0c126d2...24fc4f5d5377