Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commit5692546c00f906d1ff1adfc89bdd25f8019e60c6
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 13 Apr 2013 12:51:15 +0000 (13 18:21 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 13 Apr 2013 12:51:15 +0000 (13 18:21 +0530)
tree037c5cf37cbc7afb9508c7c44f06bb2d63b7bd30
parentddceaedca2b46511f2722472237c03ac45cbb5f5
parentbf77290011d0b972aaf1e3e75f6fef65a5630b81
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin