Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 04:58:27 +0000 (12:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 04:58:27 +0000 (12:58 +0800)

Trivial merge