Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commit293a389560d775a8180cb4fef7bd761719e78631
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 18 Oct 2013 12:11:53 +0000 (18 17:41 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 18 Oct 2013 12:11:53 +0000 (18 17:41 +0530)
treea7a1763b2856b73e55e3783cb84f1ca6f10274c0
parent8ea2ce5f232134dce7a06302bf8d6e25f0d5a674
parent410eb99584c4f7100d5020ac6a1ed815ccf00ff5
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
libraries/DisplayResults.class.php