Merge branch 'MDL-44377' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 07:15:23 +0000 (15:15 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 07:15:23 +0000 (15:15 +0800)

Trivial merge