Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 04:35:57 +0000 (12:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 04:35:57 +0000 (12:35 +0800)

Trivial merge