| commit | 3c246d2fb318c06f43cb1a02efab8d5974b244d1 | |
| author | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 17 Dec 2011 16:06:13 +0000 (17 21:36 +0530) | ||
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | |
| Sat, 17 Dec 2011 16:06:13 +0000 (17 21:36 +0530) | ||
| tree | a996d3bf88f7cdd650f829e0bb88d1f8a764ab9d | treesnapshot (tar.gz zip) |
| parent | 41b956936bea5568392603efd01538d0611f8cc0 | commitdiff |
| parent | a6c722ace0defb2368c294ae987c8fe8a6946967 | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin