Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commit60bcbd041841488725f7f85d199a3b121e24de54
authorMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 20 Jul 2015 02:41:13 +0000 (20 08:11 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 20 Jul 2015 02:41:13 +0000 (20 08:11 +0530)
tree2c044485c22743ef8f93e480806ce17b73df8bc5
parent12a4c93da66c34f454f625d6040588fbf7b921f1
parent6206ee13cfc1ac46707f3747a46d84e0d8b8b0d7
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin