| commit | 8b1b49a6b2dfc4da4c8ac8f2f3feda62e5894ce6 | |
| author | Michal Čihař <michal@cihar.com> | |
| Sun, 20 Jun 2010 14:24:28 +0000 (20 16:24 +0200) | ||
| committer | Michal Čihař <michal@cihar.com> | |
| Sun, 20 Jun 2010 14:24:28 +0000 (20 16:24 +0200) | ||
| tree | 96d0c9c0b99c90e8cc561b39a10af570664dee56 | treesnapshot (tar.gz zip) |
| parent | 12edc03e2f1953bdfdecc7eaaec760e6821b4286 | commitdiff |
| parent | 318ebf8bb5a45c892cfc1c21c78a10188733d14d | commitdiff |
Merge branch 'MAINT_3_3_4' into QA_3_3
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
| libraries/Config.class.php | diff1 | diff2 | blobhistory |