Merge remote branch 'origin/MAINT_3_3_1' into QA_3_3

Browse Source

Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html

...

This commit is contained in:

Michal Čihař

2010-03-11 13:56:27 +01:00

parent 47ec6a7b7e 995b90b551

commit d659f3ba2b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available