| commit | cdffe9fb978ce108274ac414910b2eec7a1e224a | |
| author | Michal Čihař <mcihar@suse.cz> | |
| Wed, 14 Dec 2011 09:06:36 +0000 (14 10:06 +0100) | ||
| committer | Michal Čihař <mcihar@suse.cz> | |
| Wed, 14 Dec 2011 09:06:36 +0000 (14 10:06 +0100) | ||
| tree | 82c7b94d242b3b38d1d7be8c3b34f72b8b71dfed | treesnapshot (tar.gz zip) |
| parent | de11d39fd6f8c055aef5042212c1e42092a4d159 | commitdiff |
| parent | 458e015ec2bd5f887b3240faef0ca36f8474d3bf | commitdiff |
Merge remote-tracking branch 'origin/QA_3_4'
Conflicts:
libraries/dbi/mysql.dbi.lib.php
Conflicts:
libraries/dbi/mysql.dbi.lib.php
| ChangeLog | diff1 | diff2 | blobhistory |
| config.sample.inc.php | diff1 | diff2 | blobhistory |
| libraries/dbi/mysql.dbi.lib.php | diff1 | diff2 | blobhistory |