Merge branch 'MDL-45171' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 02:12:34 +0000 (10:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 02:12:34 +0000 (10:12 +0800)

Trivial merge