Merge branch 'MDL-45486' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 9 May 2014 02:50:26 +0000 (10:50 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 9 May 2014 02:50:26 +0000 (10:50 +0800)

Trivial merge