Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:43:39 +0000 (10:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 02:43:39 +0000 (10:43 +0800)

Trivial merge