| commit | db29c02f7a96d10e0369e1adf43fd285cdb3f230 | |
| author | Piotr Przybylski <piotrprz@gmail.com> | |
| Sat, 6 Aug 2011 10:54:28 +0000 (6 12:54 +0200) | ||
| committer | Piotr Przybylski <piotrprz@gmail.com> | |
| Sat, 6 Aug 2011 10:54:28 +0000 (6 12:54 +0200) | ||
| tree | c5575b976d705cfcea47455786c12940fce5b0f9 | treesnapshot (tar.gz zip) |
| parent | 7e749a5f43dfe665cdf566da9963b4b2595fe789 | commitdiff |
| parent | 017c1ee960e8f3b3fc2c36e15330c1af72991e4c | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
libraries/advisory_rules.txt
Conflicts:
libraries/advisory_rules.txt
| libraries/advisory_rules.txt | diff1 | diff2 | blobhistory |