Merge branch 'QA_3_3'

Conflicts:
	ChangeLog
	Documentation.html
	README
	documentation-gsoc/Synchronization_User_Manual.htm
	lang/afrikaans-utf-8.inc.php
	lang/albanian-utf-8.inc.php
	lang/arabic-utf-8.inc.php
	lang/azerbaijani-utf-8.inc.php
	lang/bangla-utf-8.inc.php
	lang/basque-utf-8.inc.php
	lang/belarusian_cyrillic-utf-8.inc.php
	lang/belarusian_latin-utf-8.inc.php
	lang/bosnian-utf-8.inc.php
	lang/brazilian_portuguese-utf-8.inc.php
	lang/bulgarian-utf-8.inc.php
	lang/catalan-utf-8.inc.php
	lang/chinese_simplified-utf-8.inc.php
	lang/chinese_traditional-utf-8.inc.php
	lang/croatian-utf-8.inc.php
	lang/czech-utf-8.inc.php
	lang/danish-utf-8.inc.php
	lang/dutch-utf-8.inc.php
	lang/estonian-utf-8.inc.php
	lang/finnish-utf-8.inc.php
	lang/galician-utf-8.inc.php
	lang/georgian-utf-8.inc.php
	lang/german-utf-8.inc.php
	lang/greek-utf-8.inc.php
	lang/hebrew-utf-8.inc.php
	lang/hindi-utf-8.inc.php
	lang/hungarian-utf-8.inc.php
	lang/indonesian-utf-8.inc.php
	lang/italian-utf-8.inc.php
	lang/japanese-utf-8.inc.php
	lang/korean-utf-8.inc.php
	lang/latvian-utf-8.inc.php
	lang/lithuanian-utf-8.inc.php
	lang/macedonian_cyrillic-utf-8.inc.php
	lang/malay-utf-8.inc.php
	lang/mongolian-utf-8.inc.php
	lang/norwegian-utf-8.inc.php
	lang/persian-utf-8.inc.php
	lang/polish-utf-8.inc.php
	lang/portuguese-utf-8.inc.php
	lang/romanian-utf-8.inc.php
	lang/russian-utf-8.inc.php
	lang/serbian_cyrillic-utf-8.inc.php
	lang/serbian_latin-utf-8.inc.php
	lang/sinhala-utf-8.inc.php
	lang/slovak-utf-8.inc.php
	lang/slovenian-utf-8.inc.php
	lang/spanish-utf-8.inc.php
	lang/swedish-utf-8.inc.php
	lang/tatarish-utf-8.inc.php
	lang/thai-utf-8.inc.php
	lang/turkish-utf-8.inc.php
	lang/ukrainian-utf-8.inc.php
	lang/uzbek_cyrillic-utf-8.inc.php
	lang/uzbek_latin-utf-8.inc.php
	libraries/Config.class.php
	libraries/Table.class.php
	libraries/display_tbl.lib.php
	server_privileges.php
	server_replication.php
	server_synchronize.php
	translators.html
This commit is contained in:
Michal Čihař 2010-03-11 14:06:06 +01:00
commit aebacd260f

Diff Content Not Available