| commit | b04586ea4274a69d2058f4162675f3b5aa012bb9 | |
| author | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sun, 29 Jan 2012 16:08:24 +0000 (29 21:38 +0530) | ||
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sun, 29 Jan 2012 16:08:24 +0000 (29 21:38 +0530) | ||
| tree | 756fc38243b58e71e3eaa580f7af1a000dddaa75 | treesnapshot (tar.gz zip) |
| parent | 6d58b78a322a8a0fecd5c914d04cb4402cdab910 | commitdiff |
| parent | 426a7e3733e12ef225a96e25d4d5554665d6cf52 | commitdiff |
Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4
Conflicts:
Documentation.html
README
libraries/Config.class.php
Conflicts:
Documentation.html
README
libraries/Config.class.php