Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commit31d448e7e650cb84a32769413a3892c20c904609
authorMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 11 Jun 2013 11:38:05 +0000 (11 17:08 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 11 Jun 2013 11:38:05 +0000 (11 17:08 +0530)
tree5562649e225397cd07acfcdd90ba480357aefe50
parent56db0c29c6c76d9e402f1606113d1a41908b16e6
parent8cec5e256045c81c05e12c33a2d6560f99b43615
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin