Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 15:37:56 +0000 (15:37 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 15:37:56 +0000 (15:37 +0000)

Trivial merge