| commit | 95e841ec2d1e289f3176d38a143fcb09a96d0cca | |
| author | Michal Čihař <mcihar@novell.com> | |
| Mon, 21 Feb 2011 12:51:52 +0000 (21 13:51 +0100) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Mon, 21 Feb 2011 12:51:52 +0000 (21 13:51 +0100) | ||
| tree | c0156f80e3b2675e50d89ddc2f58b2979820d993 | treesnapshot (tar.gz zip) |
| parent | 4a830cf6e01cc5c86f9de4251c017944d0f63a28 | commitdiff |
| parent | e71bd6ae1a45cf9044145e11db10dea510e59f92 | commitdiff |
Merge branch 'QA_3_3'
Conflicts:
lang/german-utf-8.inc.php
Conflicts:
lang/german-utf-8.inc.php
| ChangeLog | diff1 | diff2 | blobhistory |