Merge branch 'MDL-47911-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 11:06:18 +0000 (11:06 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 11:06:18 +0000 (11:06 +0000)

Trivial merge