| commit | 0eca09ffff331b7b2a5d9cd4a0fe24e05df6da2f | |
| author | Piotr Przybylski <piotrprz@gmail.com> | |
| Wed, 27 Jul 2011 18:10:38 +0000 (27 20:10 +0200) | ||
| committer | Piotr Przybylski <piotrprz@gmail.com> | |
| Wed, 27 Jul 2011 18:10:38 +0000 (27 20:10 +0200) | ||
| tree | b85d2716b28c39055f0063172882e95798b2b817 | treesnapshot (tar.gz zip) |
| parent | 487da6e7af675ff899194486a7d5e8aabbc1b87b | commitdiff |
| parent | e82682d0e4037d92305ad92cb5514e822e9a5abc | commitdiff |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/dbi/mysqli.dbi.lib.php
Conflicts:
libraries/dbi/mysqli.dbi.lib.php
| Documentation.html | diff1 | diff2 | blobhistory |
| libraries/common.inc.php | diff1 | diff2 | blobhistory |
| tbl_operations.php | diff1 | diff2 | blobhistory |
| tbl_select.php | diff1 | diff2 | blobhistory |