Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 14:26:15 +0000 (14:26 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 14:26:15 +0000 (14:26 +0000)

Trivial merge