Branch: refs/heads/QA_4_2 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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0bf779c61c1a...63c5e674cc09