Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commitcb8a75b7190bc01dae4e6fe277e6eb416b59ed45
authorMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 13 Jul 2015 10:29:25 +0000 (13 15:59 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 13 Jul 2015 10:29:25 +0000 (13 15:59 +0530)
treea99bfb75c39d1fd7be05c994d532e944a0786105
parenta3285a7cd3d2b1345019f4b53d0a4a0b0f4d4c06
parent904a4ce9f3718d5e0425ee8a66fcd946c6b54759
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin