| commit | 57dc8ce4a595498a7de06ee34c7aa5129da7f934 | |
| author | Ammar Yasir <ammaryasir.88@gmail.com> | |
| Thu, 7 Jul 2011 15:30:10 +0000 (7 21:00 +0530) | ||
| committer | Ammar Yasir <ammaryasir.88@gmail.com> | |
| Thu, 7 Jul 2011 15:30:10 +0000 (7 21:00 +0530) | ||
| tree | 889ed1543d54ae9bf9affafbab62cc9b90dac682 | treesnapshot (tar.gz zip) |
| parent | 41715e512a7eca3bdc83524fb1c1bf8c3f88fa51 | commitdiff |
| parent | 5140c38db0125b627cdb49a5a91a938735469707 | commitdiff |
Merge remote branch 'phpmyadmin/master'
Conflicts:
libraries/config.default.php
tbl_select.php
Conflicts:
libraries/config.default.php
tbl_select.php
| tbl_select.php | diff1 | diff2 | blobhistory |