Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 02:30:57 +0000 (10:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 02:30:57 +0000 (10:30 +0800)
commit18ef6201c0c7475a8db5dea8d10a52a2c63196c6
treefbf2fb3c59db9290762074c4de030720bf032bc8
parentcbf34f34cccbe5200b580d0fc853124c981b52a0
parent60a67d78e865b4184e40861b9507338faea3fe3e
Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
lang/en/admin.php
lang/en/moodle.php
lib/cronlib.php
lib/db/install.xml
lib/db/upgrade.php
lib/moodlelib.php
version.php