Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 996e7314a877e469ac9a2b288c6bb6eb71d9f933 https://github.com/phpmyadmin/phpmyadmin/commit/996e7314a877e469ac9a2b288c6b... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)

Changed paths: M .travis.yml

Log Message: ----------- Cache composer cache

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

Conflicts: .travis.yml

Conflicts: .travis.yml

Commit: 63c5e674cc097b3bc0419ad02894179040732f38 https://github.com/phpmyadmin/phpmyadmin/commit/63c5e674cc097b3bc0419ad02894... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)

Changed paths: M .travis.yml

Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2

Commit: dc81ab1b3b08b1b67a17f6a96a2a93901fe9ac89 https://github.com/phpmyadmin/phpmyadmin/commit/dc81ab1b3b08b1b67a17f6a96a2a... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)

Changed paths: M .travis.yml

Log Message: ----------- Merge branch 'QA_4_2' into MAINT_4_3_0

Commit: 07c4e4cae4644eb342225b2d9a97c7d160c1496e https://github.com/phpmyadmin/phpmyadmin/commit/07c4e4cae4644eb342225b2d9a97... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)

Changed paths: M .travis.yml

Log Message: ----------- Merge branch 'MAINT_4_3_0' into QA_4_3

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a649ebadc246...07c4e4cae464