| commit | 0266ddd7bd66c4c0baf021e3b9bc0652f71dc51f | |
| author | Piotr Przybylski <piotrprz@gmail.com> | |
| Sat, 2 Jul 2011 22:41:31 +0000 (3 00:41 +0200) | ||
| committer | Piotr Przybylski <piotrprz@gmail.com> | |
| Sat, 2 Jul 2011 22:41:31 +0000 (3 00:41 +0200) | ||
| tree | b50384264686c8bd9c033227c174722851a1e06c | treesnapshot (tar.gz zip) |
| parent | da63d2cb1392008c8cc1dc03d44d41e024d6e698 | commitdiff |
| parent | 6d883454046623718bd777e0f6044eb57a65a55e | commitdiff |
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
libraries/database_interface.lib.php
Conflicts:
libraries/database_interface.lib.php
| libraries/config.default.php | diff1 | diff2 | blobhistory |
| libraries/database_interface.lib.php | diff1 | diff2 | blobhistory |
| libraries/server_synchronize.lib.php | diff1 | diff2 | blobhistory |