Now the following locations are searched:

* docroot - the english language pack lives here
* directories in $dataroot/langpacks matching *.utf8
* anything on langpacksearchpaths

This makes $dataroot/langpacks the preferred place to install language packs, and makes langpacksearchpaths unnecessary for most people.

The upshot of all this is that it'll be much easier to install language packs - just download to $dataroot/langpacks and decompress :)

Thanks to discussion with David Mudrak, Nicolas Martignoni, I?aki Arenaza and others on the forums - http://mahara.org/interaction/forum/topic.php?id=120

Allow blog, blogpost and textbox blocktypes having links or manually created <img> tags to artefacts to have those artefacts counted as being within the blocktype, and thus within the view.

This is so if people manually link to or source artefacts within textual content, those artefacts will be downloadable when the view is shown to others.

Not backporting to 1.0 although the problem will most certainly exist there - the patch is just too big to trust on a stable release.

Added some more notes to the readme about language packs and where to get the Mahoodle documentation.

(cherry picked from commit 130759ac)

During an upgrade, an error message "unknown variable $config" emerged
as require_once() did not actually included the script version.php if
this script was already included earlier during processing.

Not sure quite how I missed this before.

to Ray Merrill.

(cherry picked from commit 65e6185b)

(cherry picked from commit 823ab316)

(cherry picked from commit 4bb025de)

Conflicts:

	htdocs/lib/version.php

Conflicts:

	htdocs/lib/user.php

The former controls whether Mahara should send any e-mail. If set to false, Mahara will never send email. Good for setting up a test system when you don't want to muck around with users' email addresses to prevent sending.

The latter allows you to have all email emerging from the system sent to some other e-mail address instead of where it is aimed for.