Wikka 1.2
Wikka 1.3.1
Wikka 1.3.2
Wikka 1.3.3
Wikka 1.3.4
Merge tag 'wikka-1.2'

Conflicts:
	actions/files.php
		Wikka made extensive changes, FB can ignore most of them
		since it uses a custom upload table/form implementation
		in CheckUploadedFiles() and ShowAttachedFiles() functions
		in libs/Wakka.class.php.
	handlers/page/show.php
		<wiki-error> tags,
		changes above FB "show_attached_files" check
	libs/Wakka.class.php
		Wikka again reformatted the code block with the
		Method()/Header()/Footer() calls; no functional changes
	templates/footer.php
		Replaced by one footer.php per theme:
			templates/default/footer.php
			templates/kubrick/footer.php
			templates/light/footer.php
		(see also new GetThemePath() function in
		 libs/Wakka.class.php)
		FB changes duplicated into all these footer.phps for now,
		it seems like the users can select the theme.
	wikka.php
		1. mkdir_r() and bytesToHumanReadableUsage() functions
		   reformatted, FB moved them here from actions/files.php.
		2. Wikka moved the PAGE_GENERATION_TIME display into all
		   the templates/*/footer.phps; FB commented it out, now
		   it's commented out in each of the new footer.phps too.
Merge tag 'wikka-1.3.1'

Conflicts:
	actions/files.php
		FB ignores changes
	actions/image/image.php
		changes above FB's '/images' and "upload_path" check
	actions/usersettings.php
		Moved to actions/usersettings/usersettings.php,
		FB changes ported there too.	(<wiki-error> tags,
		accept_new_users check)
	handlers/edit/edit.php
		<wiki-error> tags
	handlers/page/files.xml.php
		moved to handles/files.xml/files.xml.php
	handlers/page/show.php
		moved to handles/show/show.php
	libs/Wakka.class.php
		1. Wikka changed Method() to handler()
		2. <wiki-error> tags
	templates/default/css/wikka.css
Merge tag 'wikka-1.3.2'

Conflicts:
	actions/files/files.php
	handlers/acls/acls.php
	handlers/edit/edit.php
	handlers/show/show.php
	libs/Wakka.class.php
	templates/default/footer.php
	templates/kubrick/footer.php
	templates/light/footer.php
Merge tag 'wikka-1.3.3'

Conflicts:
	actions/files/files.php
	actions/image/image.php
	libs/Wakka.class.php
Merge tag 'wikka-1.3.4'