Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:12:56 +0000 (15:12 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 15:12:56 +0000 (15:12 +0000)

Trivial merge