Merge branch 'wip-MDL-48252-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 16:29:25 +0000 (16:29 +0000)

Trivial merge