| commit | da57d39e8762b3c999ca54194c02f6414de0760b | |
| author | Michal Čihař <mcihar@novell.com> | |
| Mon, 21 Mar 2011 10:40:01 +0000 (21 11:40 +0100) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Mon, 21 Mar 2011 10:40:01 +0000 (21 11:40 +0100) | ||
| tree | ee429d869f2da497b48a57608e06eacd2fc41d72 | treesnapshot (tar.gz zip) |
| parent | 8e80009897929be9f355512f4bda64b7e8f080a1 | commitdiff |
| parent | 86cdc9f7bb1334f47546159c2d83960ff36426a6 | commitdiff |
Merge branch 'QA_3_3'
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
| ChangeLog | diff1 | diff2 | blobhistory |