Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commitf7626c6d277a30078bb223f9304e44c657b2e882
authorMarc Delisle <marc@infomarc.info>
Mon, 3 Aug 2015 20:05:02 +0000 (3 16:05 -0400)
committerMarc Delisle <marc@infomarc.info>
Mon, 3 Aug 2015 20:05:02 +0000 (3 16:05 -0400)
tree64d2575851f11da75497ef2f0cab4047d78df702
parent36ba14ad8ef27ea0098211465bf6ee56f8a81cf0
parente48f2127fb9710502f496a9806d9f62e95f225a2
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin