| commit | 362251abbf49df2ea8e489ed7c88827e3a97d414 | |
| author | Michal Čihař <mcihar@novell.com> | |
| Mon, 23 Aug 2010 15:08:58 +0000 (23 17:08 +0200) | ||
| committer | Michal Čihař <mcihar@novell.com> | |
| Mon, 23 Aug 2010 15:08:58 +0000 (23 17:08 +0200) | ||
| tree | 57aa15c32fa03ce3d8f0444146cb3d8dc4e2b3ca | treesnapshot (tar.gz zip) |
| parent | 9036ac09e3b5a835550ef62ebb1e1ba202728710 | commitdiff |
| parent | 133a77fac7d31a38703db2099a90c1b49de62e37 | commitdiff |
Merge branch 'MAINT_3_3_6' into QA_3_3
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html
Conflicts:
Documentation.html
README
libraries/Config.class.php
translators.html