Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commit86e1510b9adf2a7a1c8fd6145719b407246786f1
authorMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 14 Jul 2015 11:34:40 +0000 (14 17:04 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 14 Jul 2015 11:34:40 +0000 (14 17:04 +0530)
tree462b9df99d6e56c04faa77ba9fe7f5d52c48131d
parente70d2cf5518910b9c9f370524d14a8e07c001a33
parentc7a4d176c5621a440a3c9acd807dae9153decec0
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin